[gnome-bluetooth/gnome-2-32] GSettings changes for latest code

[Bastien Nocera <hadess src gnome org>]

commit 37ffb2b6b9dbee150bfa1f2a07a845e2ff5ef602
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Apr 21 16:51:08 2010 +0100

    GSettings changes for latest code

 configure.ac                                  |    4 +---
 po/POTFILES.in                                |    1 +
 properties/Makefile.am                        |   11 ++++++++---
 properties/main.c                             |    2 +-
 properties/org.gnome.Bluetooth.gschema.xml.in |    9 +++++++++
 5 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2c73ccd..9154e89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
+AM_GSETTINGS
 
 AC_PATH_PROG([XMLLINT],[xmllint])
 
@@ -67,9 +68,6 @@ if (test "$enable_icon_update" != no); then
 fi
 AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
 
-AC_SUBST(gsettingsschemadir, `pkg-config --variable gsettingsschemadir gio-2.0`)
-AC_SUBST(gsettingsupdateschemacache, `pkg-config --variable gsettingsupdateschemacache gio-2.0`)
-
 GTK_REQUIRED=2.19.1
 GLIB_REQUIRED=2.25.1
 DBUS_GLIB_REQUIRED=0.74
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7881c26..8b2414e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,6 +19,7 @@ properties/adapter.c
 [type: gettext/glade] properties/properties-no-adapter.ui
 [type: gettext/glade] properties/properties-adapter-off.ui
 properties/bluetooth-properties.desktop.in.in
+properties/org.gnome.Bluetooth.gschema.xml.in
 wizard/main.c
 [type: gettext/glade] wizard/wizard.ui
 sendto/main.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 5637182..fe25068 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -23,13 +23,18 @@ uidir = $(pkgdatadir)
 convertdir=$(datadir)/gsettings-data-convert/
 convert_DATA=gnome-bluetooth
 
-gsettingsschema_DATA = org.gnome.Bluetooth.gschema.xml
+gsettingsschema_in_files = org.gnome.Bluetooth.gschema.xml.in
+gsettingsschema_DATA = $(gsettingsschema_in_files:.xml.in=.xml)
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_CHECK_RULE@
+if GSETTINGS_SCHEMAS_INSTALL
 install-data-hook:
-	$(gsettingsupdateschemacache) $(gsettingsschemadir) --targetdir=$(gsettingsschemadir)
+	$(gsettingsupdateschemacache) $(DESTDIR)$(gsettingsschemadir) --targetdir=$(DESTDIR)$(gsettingsschemadir)
+endif
 
 CLEANFILES = $(desktop_DATA) $(schema_DATA)
 
-EXTRA_DIST = $(man_MANS) $(desktop_in_in_files) $(schema_in_files) $(ui_DATA) $(convert_DATA) $(gsettingsschema_DATA)
+EXTRA_DIST = $(man_MANS) $(desktop_in_in_files) $(schema_in_files) $(ui_DATA) $(convert_DATA) $(gsettingsschema_in_files)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/properties/main.c b/properties/main.c
index 3ea59a4..b79f01c 100644
--- a/properties/main.c
+++ b/properties/main.c
@@ -140,7 +140,7 @@ static GtkWidget *create_window(GtkWidget *notebook)
 	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
 	settings = g_settings_new (SCHEMA_NAME);
 	g_settings_bind (settings, PREF_SHOW_ICON, G_OBJECT (button), "active",
-			 G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
+			 G_SETTINGS_BIND_DEFAULT);
 
 	buttonbox = gtk_hbutton_box_new();
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_END);
diff --git a/properties/org.gnome.Bluetooth.gschema.xml.in b/properties/org.gnome.Bluetooth.gschema.xml.in
new file mode 100644
index 0000000..ee7165f
--- /dev/null
+++ b/properties/org.gnome.Bluetooth.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema id="org.gnome.Bluetooth" path="/apps/bluetooth-manager/" gettext-domain="gnome-bluetooth2">
+    <key name="show-icon" type="b">
+      <default>true</default>
+      <summary>Whether to show the notification icon</summary>
+      <description>Whether to show the notification icon.</description>
+    </key>
+  </schema>
+</schemalist>