[gnome-bluetooth] properties: Remove "Show Bluetooth icon" preference

[Bastien Nocera <hadess src gnome org>]

commit 6e512b650ff8a103664561f54f1cfe2579a6cfeb
Author: Bastien Nocera <hadess hadess net>
Date:   Sun Feb 6 22:00:15 2011 +0000

    properties: Remove "Show Bluetooth icon" preference
    
    https://bugzilla.gnome.org/show_bug.cgi?id=641422

 po/POTFILES.in                                |    1 -
 properties/Makefile.am                        |    8 --------
 properties/cc-bluetooth-panel.c               |    9 ---------
 properties/gnome-bluetooth                    |    2 --
 properties/org.gnome.Bluetooth.gschema.xml.in |    9 ---------
 properties/properties-adapter.ui              |   20 +-------------------
 6 files changed, 1 insertions(+), 48 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 96a429e..5e5d697 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,7 +21,6 @@ properties/cc-bluetooth-panel.c
 [type: gettext/glade] properties/properties-adapter-off.ui
 [type: gettext/glade] properties/properties-killed-adapter.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 bf11199..e6e80d8 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -26,14 +26,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 ui_DATA = properties-no-adapter.ui properties-adapter-off.ui properties-killed-adapter.ui properties-adapter.ui
 uidir = $(pkgdatadir)
 
-convertdir=$(datadir)/GConf/gsettings
-convert_DATA=gnome-bluetooth
-
-gsettingsschema_in_files = org.gnome.Bluetooth.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
-
 CLEANFILES = $(desktop_DATA) $(schema_DATA)
 
 EXTRA_DIST = $(man_MANS) $(desktop_in_in_files) $(schema_in_files) $(ui_DATA) $(convert_DATA) $(gsettingsschema_in_files)
diff --git a/properties/cc-bluetooth-panel.c b/properties/cc-bluetooth-panel.c
index c4f2de0..55b201f 100644
--- a/properties/cc-bluetooth-panel.c
+++ b/properties/cc-bluetooth-panel.c
@@ -41,9 +41,6 @@ G_DEFINE_DYNAMIC_TYPE (CcBluetoothPanel, cc_bluetooth_panel, CC_TYPE_PANEL)
 
 static void cc_bluetooth_panel_finalize (GObject *object);
 
-#define SCHEMA_NAME		"org.gnome.Bluetooth"
-#define PREF_SHOW_ICON		"show-icon"
-
 static void
 receive_callback (GtkWidget *item, GtkWindow *window)
 {
@@ -89,12 +86,6 @@ create_window (GtkWidget *notebook,
 
 	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
 
-	button = gtk_check_button_new_with_mnemonic (_("_Show Bluetooth icon"));
-	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);
-
 	buttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_END);
 	gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 0);
diff --git a/properties/properties-adapter.ui b/properties/properties-adapter.ui
index 4b18a45..7d35d6d 100644
--- a/properties/properties-adapter.ui
+++ b/properties/properties-adapter.ui
@@ -528,24 +528,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkCheckButton" id="widget34">
-            <property name="label">_Show Bluetooth icon</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="use_underline">True</property>
-            <property name="xalign">0</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkHButtonBox" id="widget35">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -573,7 +555,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>