Fix some compiler warningsHEADmaster

5 files changed, 2 insertions, 12 deletions

diff --git a/gconf/gconf-client.c b/gconf/gconf-client.c
index 16be0322..3c8ba505 100644
--- a/gconf/gconf-client.c
+++ b/gconf/gconf-client.c
@@ -442,8 +442,6 @@ notify_from_server_callback (GConfEngine* conf, guint cnxn_id,
  * #GConfClient, this function returns the same one they're using, but
  * with the reference count incremented. So you have to unref either way.
  *
- * It's important to call g_type_init() before using this GObject, to initialize the type system.
- *
  * Return value: (transfer full): a new #GConfClient. g_object_unref() when you're done.
  */
 GConfClient*
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 1b4452ac..ecb31798 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -2483,8 +2483,6 @@ get_ior (gboolean start_if_not_found,
                 return NULL;
         }
 
-        g_type_init ();
-
         connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
         if (connection == NULL) {
                 if (failure_log)
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 1ed3d083..97647b53 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -682,10 +682,6 @@ system_bus_message_handler (DBusConnection *connection,
 			    DBusMessage    *message,
 			    void           *user_data)
 {
-  DBusMessage *reply;
-
-  reply = NULL;
-
   if (dbus_message_is_signal (message,
 			      "org.gnome.GConf.Defaults",
                               "SystemSet"))
diff --git a/gconf/gconftool.c b/gconf/gconftool.c
index 94274afb..1f096015 100644
--- a/gconf/gconftool.c
+++ b/gconf/gconftool.c
@@ -578,8 +578,6 @@ main (int argc, char** argv)
   bindtextdomain (GETTEXT_PACKAGE,GCONF_LOCALE_DIR);
   textdomain (GETTEXT_PACKAGE);
 
-  g_thread_init (NULL);
-
   _gconf_init_i18n ();
   
   context = g_option_context_new (N_("- Tool to manipulate a GConf configuration"));
diff --git a/gconf/testgconfclient.c b/gconf/testgconfclient.c
index 7058bbba..f17b85f3 100644
--- a/gconf/testgconfclient.c
+++ b/gconf/testgconfclient.c
@@ -131,7 +131,7 @@ entry_attached_to(GConfClient* client, const gchar* key)
                    G_CALLBACK(entry_destroyed_callback),
                    client);
   
-  hbox = gtk_hbox_new(FALSE, 10);
+  hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 
   label = gtk_label_new(key);
 
@@ -268,7 +268,7 @@ create_controls(GConfClient* client)
   g_signal_connect(G_OBJECT(win), "destroy",
                    G_CALLBACK(destroy_callback), client);
 
-  vbox = gtk_vbox_new(FALSE, 10);
+  vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 
   gtk_container_add(GTK_CONTAINER(win), vbox);