gconf r2792 - in trunk: . doc gconf

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Feb 23 05:59:36 2009
New Revision: 2792
URL: http://svn.gnome.org/viewvc/gconf?rev=2792&view=rev

Log:
Remove deprecated GTK+ api


Modified:
   trunk/ChangeLog
   trunk/doc/intro-article.sgml
   trunk/gconf/gnome-testclient.c
   trunk/gconf/testgconfclient.c

Modified: trunk/doc/intro-article.sgml
==============================================================================
--- trunk/doc/intro-article.sgml	(original)
+++ trunk/doc/intro-article.sgml	Mon Feb 23 05:59:36 2009
@@ -642,17 +642,17 @@
 
   if (value == NULL)
     {
-      gtk_label_set(GTK_LABEL(label), "<unset>");
+      gtk_label_set_text(GTK_LABEL(label), "<unset>");
     }
   else
     {
       if (value->type == GCONF_VALUE_STRING)
         {
-          gtk_label_set(GTK_LABEL(label), gconf_value_get_string(value));
+          gtk_label_set_text(GTK_LABEL(label), gconf_value_get_string(value));
         }
       else
         {
-          gtk_label_set(GTK_LABEL(label), "<wrong type>");
+          gtk_label_set_text(GTK_LABEL(label), "<wrong type>");
         }
     }
 }
@@ -767,9 +767,9 @@
                        NULL);
 
 
-  gtk_signal_connect(GTK_OBJECT(entry), "activate",
-                     GTK_SIGNAL_FUNC(entry_activated_callback),
-                     client);
+  g_signal_connect(G_OBJECT(entry), "activate",
+                   G_CALLBACK(entry_activated_callback),
+                   client);
   
   gtk_widget_show_all(window);
 

Modified: trunk/gconf/gnome-testclient.c
==============================================================================
--- trunk/gconf/gnome-testclient.c	(original)
+++ trunk/gconf/gnome-testclient.c	Mon Feb 23 05:59:36 2009
@@ -107,14 +107,14 @@
 
   gnome_app_set_contents(GNOME_APP(app), entry);
 
-  gtk_signal_connect(GTK_OBJECT(entry), 
+  g_signal_connect(G_OBJECT(entry), 
                      "changed", 
-                     GTK_SIGNAL_FUNC(changed_cb),
+                     G_CALLBACK(changed_cb),
                      conf);
 
-  gtk_signal_connect(GTK_OBJECT(app),
+  g_signal_connect(G_OBJECT(app),
                      "delete_event",
-                     GTK_SIGNAL_FUNC(gtk_main_quit),
+                     G_CALLBACK(gtk_main_quit),
                      NULL);
 
   cnxn = gconf_engine_notify_add(conf, "/gnome/gconf-testclient/entry_contents", notify_func, entry);

Modified: trunk/gconf/testgconfclient.c
==============================================================================
--- trunk/gconf/testgconfclient.c	(original)
+++ trunk/gconf/testgconfclient.c	Mon Feb 23 05:59:36 2009
@@ -181,7 +181,7 @@
   gconf_client_add_dir(client, "/apps/gnome/testgconfclient/subdir", GCONF_CLIENT_PRELOAD_NONE, NULL);
 
   s = g_strdup_printf("Maindir added %d times\nSubdir added %d times", maindir, subdir);
-  gtk_label_set(GTK_LABEL(label), s);
+  gtk_label_set_text(GTK_LABEL(label), s);
   g_free(s);
 }
 
@@ -202,7 +202,7 @@
   gconf_client_remove_dir(client, "/apps/gnome/testgconfclient/subdir", NULL);
 
   s = g_strdup_printf("Maindir added %d times\nSubdir added %d times", maindir, subdir);
-  gtk_label_set(GTK_LABEL(label), s);
+  gtk_label_set_text(GTK_LABEL(label), s);
   g_free(s);
 }
 
@@ -223,7 +223,7 @@
   gconf_client_add_dir(client, "/apps/gnome/testgconfclient", GCONF_CLIENT_PRELOAD_NONE, NULL);
 
   s = g_strdup_printf("Maindir added %d times\nSubdir added %d times", maindir, subdir);
-  gtk_label_set(GTK_LABEL(label), s);
+  gtk_label_set_text(GTK_LABEL(label), s);
   g_free(s);
 }
   
@@ -244,7 +244,7 @@
   gconf_client_remove_dir(client, "/apps/gnome/testgconfclient", NULL);
 
   s = g_strdup_printf("Maindir added %d times\nSubdir added %d times", maindir, subdir);
-  gtk_label_set(GTK_LABEL(label), s);
+  gtk_label_set_text(GTK_LABEL(label), s);
   g_free(s);
 }