seahorse r2340 - in seahorse-plugins/trunk: . data

[sadam svn gnome org]

Author: sadam
Date: Mon Aug 11 00:34:56 2008
New Revision: 2340
URL: http://svn.gnome.org/viewvc/seahorse?rev=2340&view=rev

Log:
2008-08-10  Adam Schreiber  <sadam clemson edu>

    * data/Makefile.am:
    * data/seahorse.schemas.in (moved to 
data/seahorse-plugins.schemas.in):
    Fixed conflict with seahorse schemas.  Partially fixes bug #546531


Added:
   seahorse-plugins/trunk/data/seahorse-plugins.schemas.in
      - copied unchanged from r2339, /seahorse-plugins/trunk/data/seahorse.schemas.in
Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/data/Makefile.am

Modified: seahorse-plugins/trunk/data/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/data/Makefile.am	(original)
+++ seahorse-plugins/trunk/data/Makefile.am	Mon Aug 11 00:34:56 2008
@@ -2,7 +2,7 @@
 @INTLTOOL_SCHEMAS_RULE@
 
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = seahorse.schemas.in
+schemas_in_files = seahorse-plugins.schemas.in
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 if GCONF_SCHEMAS_INSTALL