Merge authors: Sebastien Bacher (seb128) Related merge proposals: https://code.launchpad.net/~seb128/indicator-applet/gconf-not/+merge/37869 proposed by: Sebastien Bacher (seb128) review: Approve - Ted Gould (ted) ------------------------------------------------------------ revno: 374 [merge] committer: Ted Gould <[email protected]> branch nick: applet timestamp: Fri 2010-10-08 16:06:33 -0600 message: Removing unused GConf support removed: data/indicator-applet.schemas.in modified: configure.ac data/Makefile.am po/POTFILES.in
-- lp:indicator-applet https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet Your team ayatana-commits is subscribed to branch lp:indicator-applet. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet/+edit-subscription
=== modified file 'configure.ac' --- configure.ac 2010-09-22 15:43:54 +0000 +++ configure.ac 2010-10-07 16:02:37 +0000 @@ -36,9 +36,6 @@ AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) -AC_PATH_PROG(GCONFTOOL, gconftool-2) -AM_GCONF_SOURCE_2 - ########################### # Check to see if we're local ########################### === modified file 'data/Makefile.am' --- data/Makefile.am 2010-05-27 20:03:36 +0000 +++ data/Makefile.am 2010-10-07 16:02:37 +0000 @@ -24,21 +24,6 @@ ############################## -# GConf Schema -############################## - -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) - -schema_in_files = \ - indicator-applet.schemas.in - -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) - -...@intltool_schemas_rule@ - -############################## # Icons ############################## @@ -78,13 +63,4 @@ MAINTAINERCLEANFILES = \ Makefile.in -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(schema_DATA) -else -install-data-local: -endif - - === removed file 'data/indicator-applet.schemas.in' --- data/indicator-applet.schemas.in 2008-10-30 17:31:31 +0000 +++ data/indicator-applet.schemas.in 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/indicator-applet/dummy_value</key> - <applyto>/apps/indicator-applet/dummy_value</applyto> - <owner>indicator-applet</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Setting up basic GConf</short> - <long>Building up install directories. Need a dummy value.</long> - </locale> - </schema> - </schemalist> -</gconfschemafile> === modified file 'po/POTFILES.in' --- po/POTFILES.in 2010-05-27 20:03:36 +0000 +++ po/POTFILES.in 2010-10-07 16:02:37 +0000 @@ -3,5 +3,4 @@ data/GNOME_IndicatorAppletAppmenu.server.in.in data/GNOME_IndicatorAppletComplete.server.in.in data/GNOME_FastUserSwitchApplet.server.in.in -data/indicator-applet.schemas.in src/applet-main.c
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
