gconf r2614 - in trunk: . examples gconf
- From: kmaraas svn gnome org
- To: svn-commits-list gnome org
- Subject: gconf r2614 - in trunk: . examples gconf
- Date: Wed, 4 Jun 2008 10:47:49 +0000 (UTC)
Author: kmaraas
Date: Wed Jun 4 10:47:48 2008
New Revision: 2614
URL: http://svn.gnome.org/viewvc/gconf?rev=2614&view=rev
Log:
2008-06-04 Kjartan Maraas <kmaraas gnome org>
* configure.in: Bump version after tagging.
* examples/complex-gconf-app.c:
(configurable_widget_destroy_callback),
(create_configurable_widget), (prefs_dialog_destroyed),
(prefs_clicked), (create_main_window),
(prefs_dialog_get_change_set), (prefs_dialog_update_sensitivity),
(prefs_dialog_apply), (update_entry), (prefs_dialog_revert),
(config_entry_destroy_callback), (config_entry_changed_callback),
(create_config_entry), (prefs_dialog_destroy_callback),
(create_prefs_dialog):
* gconf/testgconfclient.c: (entry_notify_func),
(entry_destroyed_callback), (entry_changed_callback),
(entry_attached_to), (addsub_callback), (removesub_callback),
(addmain_callback), (removemain_callback), (create_controls):
Remove uses of deprecated gtk_signal* and gtk_object* functions.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/examples/complex-gconf-app.c
trunk/gconf/testgconfclient.c
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Jun 4 10:47:48 2008
@@ -1,4 +1,4 @@
-AC_INIT([GConf],[2.23.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
+AC_INIT([GConf],[2.23.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
AC_DEFUN([AC_FYI], [echo "FYI: " $1])
Modified: trunk/examples/complex-gconf-app.c
==============================================================================
--- trunk/examples/complex-gconf-app.c (original)
+++ trunk/examples/complex-gconf-app.c Wed Jun 4 10:47:48 2008
@@ -123,8 +123,8 @@
guint notify_id;
GConfClient* client;
- client = gtk_object_get_data(GTK_OBJECT(widget), "client");
- notify_id = GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(widget), "notify_id"));
+ client = g_object_get_data(widget, "client");
+ notify_id = GPOINTER_TO_UINT(g_object_get_data(widget, "notify_id"));
if (notify_id != 0)
gconf_client_notify_remove(client, notify_id);
@@ -191,12 +191,11 @@
/* Note that notify_id will be 0 if there was an error,
so we handle that in our destroy callback. */
- gtk_object_set_data(GTK_OBJECT(label), "notify_id", GUINT_TO_POINTER(notify_id));
- gtk_object_set_data(GTK_OBJECT(label), "client", client);
+ g_object_set_data(label, "notify_id", GUINT_TO_POINTER(notify_id));
+ g_object_set_data(label, "client", client);
- gtk_signal_connect(GTK_OBJECT(label), "destroy",
- GTK_SIGNAL_FUNC(configurable_widget_destroy_callback),
- NULL);
+ g_signal_connect(label, "destroy",
+ G_CALLBACK(configurable_widget_destroy_callback), NULL);
return frame;
}
@@ -204,7 +203,7 @@
static void
prefs_dialog_destroyed(GtkWidget* dialog, gpointer main_window)
{
- gtk_object_set_data(GTK_OBJECT(main_window), "prefs", NULL);
+ g_object_set_data(main_window, "prefs", NULL);
}
static void
@@ -214,19 +213,19 @@
GtkWidget* main_window = data;
GConfClient* client;
- prefs_dialog = gtk_object_get_data(GTK_OBJECT(main_window), "prefs");
+ prefs_dialog = g_object_get_data(main_window, "prefs");
if (prefs_dialog == NULL)
{
- client = gtk_object_get_data(GTK_OBJECT(main_window), "client");
+ client = g_object_get_data(main_window, "client");
prefs_dialog = create_prefs_dialog(main_window, client);
- gtk_object_set_data(GTK_OBJECT(main_window), "prefs", prefs_dialog);
+ g_object_set_data(G_OBJECT(main_window), "prefs", prefs_dialog);
- gtk_signal_connect(GTK_OBJECT(prefs_dialog), "destroy",
- GTK_SIGNAL_FUNC(prefs_dialog_destroyed),
- main_window);
+ g_signal_connect(prefs_dialog, "destroy",
+ G_CALLBACK(prefs_dialog_destroyed),
+ main_window);
gtk_widget_show_all(prefs_dialog);
}
@@ -263,16 +262,16 @@
config = create_configurable_widget(client, "/apps/basic-gconf-app/blah");
gtk_box_pack_start(GTK_BOX(vbox), config, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(w), "delete_event",
- GTK_SIGNAL_FUNC(delete_event_callback),
- NULL);
+ g_signal_connect(w, "delete_event",
+ G_CALLBACK(delete_event_callback),
+ NULL);
- gtk_object_set_data(GTK_OBJECT(w), "client", client);
+ g_object_set_data(w, "client", client);
prefs = gtk_button_new_with_label("Prefs");
gtk_box_pack_end(GTK_BOX(vbox), prefs, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(prefs), "clicked",
- GTK_SIGNAL_FUNC(prefs_clicked), w);
+ g_signal_connect(prefs, "clicked",
+ G_CALLBACK(prefs_clicked), w);
return w;
}
@@ -289,7 +288,7 @@
static GConfChangeSet*
prefs_dialog_get_change_set(GtkWidget* dialog)
{
- return gtk_object_get_data(GTK_OBJECT(dialog), "changeset");
+ return g_object_get_data(dialog, "changeset");
}
@@ -303,17 +302,17 @@
GConfChangeSet* cs;
GConfChangeSet* revert_cs;
- apply = gtk_object_get_data(GTK_OBJECT(dialog), "apply");
- revert = gtk_object_get_data(GTK_OBJECT(dialog), "revert");
- ok = gtk_object_get_data(GTK_OBJECT(dialog), "ok");
- cancel = gtk_object_get_data(GTK_OBJECT(dialog), "cancel");
+ apply = g_object_get_data(dialog, "apply");
+ revert = g_object_get_data(dialog, "revert");
+ ok = g_object_get_data(dialog, "ok");
+ cancel = g_object_get_data(dialog, "cancel");
g_assert(apply != NULL);
g_assert(revert != NULL);
cs = prefs_dialog_get_change_set(dialog);
- revert_cs = gtk_object_get_data(GTK_OBJECT(dialog), "revert_changeset");
+ revert_cs = g_object_get_data(dialog, "revert_changeset");
if (gconf_change_set_size(cs) > 0)
{
@@ -337,11 +336,11 @@
GConfClient* client;
GConfChangeSet* revert_cs;
- client = gtk_object_get_data(GTK_OBJECT(dialog), "client");
+ client = g_object_get_data(dialog, "client");
/* Create the revert changeset on the first apply; this means
the revert button should now be sensitive */
- revert_cs = gtk_object_get_data(GTK_OBJECT(dialog), "revert_changeset");
+ revert_cs = g_object_get_data(dialog, "revert_changeset");
if (revert_cs == NULL)
{
@@ -353,10 +352,10 @@
"/apps/basic-gconf-app/blah",
NULL);
- gtk_object_set_data(GTK_OBJECT(dialog), "revert_changeset", revert_cs);
+ g_object_set_data(dialog, "revert_changeset", revert_cs);
}
- cs = gtk_object_get_data(GTK_OBJECT(dialog), "changeset");
+ cs = g_object_get_data(dialog, "changeset");
/* again, relying on default error handler. The third argument here
is whether to remove the successfully-committed items from the
@@ -375,14 +374,14 @@
GConfValue* value = NULL;
GConfClient* client;
- client = gtk_object_get_data(GTK_OBJECT(dialog), "client");
+ client = g_object_get_data(dialog, "client");
if (gconf_change_set_check_value(cs, config_key,
&value))
{
GtkWidget* entry;
- entry = gtk_object_get_data(GTK_OBJECT(dialog), config_key);
+ entry = g_object_get_data(dialog, config_key);
g_assert(entry != NULL);
@@ -431,14 +430,14 @@
GConfChangeSet* revert_cs;
GConfClient* client;
- revert_cs = gtk_object_get_data(GTK_OBJECT(dialog), "revert_changeset");
+ revert_cs = g_object_get_data(dialog, "revert_changeset");
if (revert_cs == NULL)
return; /* happens on cancel, if no apply has been done */
- client = gtk_object_get_data(GTK_OBJECT(dialog), "client");
+ client = g_object_get_data(dialog, "client");
- cs = gtk_object_get_data(GTK_OBJECT(dialog), "changeset");
+ cs = g_object_get_data(dialog, "changeset");
/* When reverting, you want to discard any pending changes so
"apply" won't do anything */
@@ -463,7 +462,7 @@
{
gchar* key;
- key = gtk_object_get_data(GTK_OBJECT(entry), "key");
+ key = g_object_get_data(entry, "key");
g_free(key);
}
@@ -480,7 +479,7 @@
text = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
- key = gtk_object_get_data(GTK_OBJECT(entry), "key");
+ key = g_object_get_data(entry, "key");
/* Unset if the string is zero-length, otherwise set */
if (*text != '\0')
@@ -517,22 +516,21 @@
if (initial)
gconf_value_free(initial);
- gtk_object_set_data(GTK_OBJECT(entry), "client", client);
- gtk_object_set_data(GTK_OBJECT(entry), "key", g_strdup(config_key));
+ g_object_set_data(entry, "client", client);
+ g_object_set_data(entry, "key", g_strdup(config_key));
- gtk_signal_connect(GTK_OBJECT(entry), "destroy",
- GTK_SIGNAL_FUNC(config_entry_destroy_callback),
- NULL);
-
- gtk_signal_connect(GTK_OBJECT(entry), "changed",
- GTK_SIGNAL_FUNC(config_entry_changed_callback),
- prefs_dialog);
+ g_signal_connect(entry, "destroy",
+ G_CALLBACK(config_entry_destroy_callback),
+ NULL);
+
+ g_signal_connect(entry, "changed",
+ G_CALLBACK(config_entry_changed_callback),
+ prefs_dialog);
/* A dubious hack; set the entry as object data using its
config key as the key so we can find it in the prefs dialog
revert code */
- gtk_object_set_data(GTK_OBJECT(prefs_dialog),
- config_key, entry);
+ g_object_set_data(prefs_dialog, config_key, entry);
/* Set the entry insensitive if the key it edits isn't writable */
gtk_widget_set_sensitive (entry,
@@ -579,11 +577,11 @@
GConfChangeSet* revert_cs;
GConfClient* client;
- client = gtk_object_get_data(GTK_OBJECT(dialog), "client");
+ client = g_object_get_data(dialog, "client");
- cs = gtk_object_get_data(GTK_OBJECT(dialog), "changeset");
+ cs = g_object_get_data(dialog, "changeset");
- revert_cs = gtk_object_get_data(GTK_OBJECT(dialog), "revert_changeset");
+ revert_cs = g_object_get_data(dialog, "revert_changeset");
gconf_change_set_unref(cs);
@@ -615,10 +613,10 @@
ok = gtk_button_new_with_label("OK");
cancel = gtk_button_new_with_label("Cancel");
- gtk_object_set_data(GTK_OBJECT(dialog), "apply", apply);
- gtk_object_set_data(GTK_OBJECT(dialog), "revert", revert);
- gtk_object_set_data(GTK_OBJECT(dialog), "ok", ok);
- gtk_object_set_data(GTK_OBJECT(dialog), "cancel", cancel);
+ g_object_set_data(dialog, "apply", apply);
+ g_object_set_data(dialog, "revert", revert);
+ g_object_set_data(dialog, "ok", ok);
+ g_object_set_data(dialog, "cancel", cancel);
bbox = gtk_hbutton_box_new();
@@ -638,33 +636,33 @@
cs = gconf_change_set_new();
- gtk_object_set_data(GTK_OBJECT(dialog), "changeset", cs);
- gtk_object_set_data(GTK_OBJECT(dialog), "client", client);
+ g_object_set_data(dialog, "changeset", cs);
+ g_object_set_data(dialog, "client", client);
/* Grab a reference */
g_object_ref(G_OBJECT(client));
- gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
- GTK_SIGNAL_FUNC(prefs_dialog_destroy_callback),
- NULL);
+ g_signal_connect(dialog, "destroy",
+ G_CALLBACK(prefs_dialog_destroy_callback),
+ NULL);
prefs_dialog_update_sensitivity(dialog);
- gtk_signal_connect(GTK_OBJECT(apply), "clicked",
- GTK_SIGNAL_FUNC(apply_button_callback),
- dialog);
-
- gtk_signal_connect(GTK_OBJECT(revert), "clicked",
- GTK_SIGNAL_FUNC(revert_button_callback),
- dialog);
-
- gtk_signal_connect(GTK_OBJECT(ok), "clicked",
- GTK_SIGNAL_FUNC(ok_button_callback),
- dialog);
-
- gtk_signal_connect(GTK_OBJECT(cancel), "clicked",
- GTK_SIGNAL_FUNC(cancel_button_callback),
- dialog);
+ g_signal_connect(apply, "clicked",
+ G_CALLBACK(apply_button_callback),
+ dialog);
+
+ g_signal_connect(revert, "clicked",
+ G_CALLBACK(revert_button_callback),
+ dialog);
+
+ g_signal_connect(ok, "clicked",
+ G_CALLBACK(ok_button_callback),
+ dialog);
+
+ g_signal_connect(cancel, "clicked",
+ G_CALLBACK(cancel_button_callback),
+ dialog);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent));
Modified: trunk/gconf/testgconfclient.c
==============================================================================
--- trunk/gconf/testgconfclient.c (original)
+++ trunk/gconf/testgconfclient.c Wed Jun 4 10:47:48 2008
@@ -63,10 +63,12 @@
g_return_if_fail(GTK_IS_ENTRY(entry));
- gtk_signal_handler_block_by_data(GTK_OBJECT(entry), client);
+ g_signal_handler_block_matched(entry, G_SIGNAL_MATCH_DATA, 0, 0,
+ NULL, NULL, client);
gtk_entry_set_text(GTK_ENTRY(entry),
gconf_value_get_string(gconf_entry->value));
- gtk_signal_handler_unblock_by_data(GTK_OBJECT(entry), client);
+ g_signal_handler_unblock_matched(entry, G_SIGNAL_MATCH_DATA, 0, 0,
+ NULL, NULL, client);
}
static void
@@ -74,8 +76,7 @@
{
GConfClient* client = data;
- guint notify_id = GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(entry),
- "notify_id"));
+ guint notify_id = GPOINTER_TO_UINT(g_object_get_data(entry, "notify_id"));
gconf_client_notify_remove(client, notify_id);
}
@@ -88,7 +89,7 @@
gchar* text;
text = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
- key = gtk_object_get_data(GTK_OBJECT(entry), "key");
+ key = g_object_get_data(G_OBJECT(entry), "key");
gconf_client_set_string(client, key, text, NULL);
@@ -106,8 +107,8 @@
entry = gtk_entry_new();
- gtk_object_set_data_full(GTK_OBJECT(entry), "key",
- g_strdup(key), g_free);
+ g_object_set_data_full(G_OBJECT(entry), "key",
+ g_strdup(key), g_free);
val = gconf_client_get_string(client, key, NULL);
@@ -118,16 +119,16 @@
notify_id = gconf_client_notify_add(client, key, entry_notify_func, entry, NULL, NULL);
- gtk_object_set_data(GTK_OBJECT(entry), "notify_id",
- GUINT_TO_POINTER(notify_id));
+ g_object_set_data(G_OBJECT(entry), "notify_id",
+ GUINT_TO_POINTER(notify_id));
- gtk_signal_connect(GTK_OBJECT(entry), "changed",
- GTK_SIGNAL_FUNC(entry_changed_callback),
- client);
-
- gtk_signal_connect(GTK_OBJECT(entry), "destroy",
- GTK_SIGNAL_FUNC(entry_destroyed_callback),
- client);
+ g_signal_connect(G_OBJECT(entry), "changed",
+ G_CALLBACK(entry_changed_callback),
+ client);
+
+ g_signal_connect(G_OBJECT(entry), "destroy",
+ G_CALLBACK(entry_destroyed_callback),
+ client);
hbox = gtk_hbox_new(FALSE, 10);
@@ -166,15 +167,15 @@
addsub_callback(GtkWidget* button, gpointer data)
{
GtkWidget* win = data;
- GConfClient* client = gtk_object_get_data(GTK_OBJECT(win), "client");
- GtkWidget* label = gtk_object_get_data(GTK_OBJECT(win), "label");
- int subdir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "subdir"));
- int maindir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "maindir"));
+ GConfClient* client = g_object_get_data(G_OBJECT(win), "client");
+ GtkWidget* label = g_object_get_data(G_OBJECT(win), "label");
+ int subdir = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(win), "subdir"));
+ int maindir = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(win), "maindir"));
char *s;
subdir++;
- gtk_object_set_data(GTK_OBJECT(win), "subdir", GINT_TO_POINTER(subdir));
+ g_object_set_data(G_OBJECT(win), "subdir", GINT_TO_POINTER(subdir));
gconf_client_add_dir(client, "/apps/gnome/testgconfclient/subdir", GCONF_CLIENT_PRELOAD_NONE, NULL);
@@ -187,15 +188,15 @@
removesub_callback(GtkWidget* button, gpointer data)
{
GtkWidget* win = data;
- GConfClient* client = gtk_object_get_data(GTK_OBJECT(win), "client");
- GtkWidget* label = gtk_object_get_data(GTK_OBJECT(win), "label");
- int subdir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "subdir"));
- int maindir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "maindir"));
+ GConfClient* client = g_object_get_data(G_OBJECT(win), "client");
+ GtkWidget* label = g_object_get_data(G_OBJECT(win), "label");
+ int subdir = GPOINTER_TO_INT(g_object_get_data(GTK_OBJECT(win), "subdir"));
+ int maindir = GPOINTER_TO_INT(g_object_get_data(GTK_OBJECT(win), "maindir"));
char *s;
subdir--;
- gtk_object_set_data(GTK_OBJECT(win), "subdir", GINT_TO_POINTER(subdir));
+ g_object_set_data(G_OBJECT(win), "subdir", GINT_TO_POINTER(subdir));
gconf_client_remove_dir(client, "/apps/gnome/testgconfclient/subdir", NULL);
@@ -208,15 +209,15 @@
addmain_callback(GtkWidget* button, gpointer data)
{
GtkWidget* win = data;
- GConfClient* client = gtk_object_get_data(GTK_OBJECT(win), "client");
- GtkWidget* label = gtk_object_get_data(GTK_OBJECT(win), "label");
- int subdir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "subdir"));
- int maindir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "maindir"));
+ GConfClient* client = g_object_get_data(G_OBJECT(win), "client");
+ GtkWidget* label = g_object_get_data(G_OBJECT(win), "label");
+ int subdir = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(win), "subdir"));
+ int maindir = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(win), "maindir"));
char *s;
maindir++;
- gtk_object_set_data(GTK_OBJECT(win), "maindir", GINT_TO_POINTER(maindir));
+ g_object_set_data(G_OBJECT(win), "maindir", GINT_TO_POINTER(maindir));
gconf_client_add_dir(client, "/apps/gnome/testgconfclient", GCONF_CLIENT_PRELOAD_NONE, NULL);
@@ -229,15 +230,15 @@
removemain_callback(GtkWidget* button, gpointer data)
{
GtkWidget* win = data;
- GConfClient* client = gtk_object_get_data(GTK_OBJECT(win), "client");
- GtkWidget* label = gtk_object_get_data(GTK_OBJECT(win), "label");
- int subdir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "subdir"));
- int maindir = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(win), "maindir"));
+ GConfClient* client = g_object_get_data(G_OBJECT(win), "client");
+ GtkWidget* label = g_object_get_data(G_OBJECT(win), "label");
+ int subdir = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(win), "subdir"));
+ int maindir = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(win), "maindir"));
char *s;
maindir--;
- gtk_object_set_data(GTK_OBJECT(win), "maindir", GINT_TO_POINTER(maindir));
+ g_object_set_data(G_OBJECT(win), "maindir", GINT_TO_POINTER(maindir));
gconf_client_remove_dir(client, "/apps/gnome/testgconfclient", NULL);
@@ -261,10 +262,10 @@
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_object_set_data(GTK_OBJECT(win), "client", client);
+ g_object_set_data(G_OBJECT(win), "client", client);
- gtk_signal_connect(GTK_OBJECT(win), "destroy",
- GTK_SIGNAL_FUNC(destroy_callback), client);
+ g_signal_connect(G_OBJECT(win), "destroy",
+ G_CALLBACK(destroy_callback), client);
vbox = gtk_vbox_new(FALSE, 10);
@@ -272,33 +273,33 @@
label = gtk_label_new("Maindir added 1 times\nSubdir added 0 times");
gtk_box_pack_end(GTK_BOX(vbox), label, FALSE, FALSE, 0);
- gtk_object_set_data(GTK_OBJECT(win), "label", label);
- gtk_object_set_data(GTK_OBJECT(win), "subdir", GINT_TO_POINTER(0));
- gtk_object_set_data(GTK_OBJECT(win), "maindir", GINT_TO_POINTER(1));
+ g_object_set_data(G_OBJECT(win), "label", label);
+ g_object_set_data(G_OBJECT(win), "subdir", GINT_TO_POINTER(0));
+ g_object_set_data(G_OBJECT(win), "maindir", GINT_TO_POINTER(1));
button = gtk_button_new_with_label("Quit");
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(quit_callback), win);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(quit_callback), win);
gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label("Remove subdir");
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(removesub_callback), win);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(removesub_callback), win);
gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label("Add subdir");
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(addsub_callback), win);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(addsub_callback), win);
gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label("Remove maindir");
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(removemain_callback), win);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(removemain_callback), win);
gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label("Add maindir");
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(addmain_callback), win);
+ g_signal_connect(G_OBJECT(button), "clicked",
+ G_CALLBACK(addmain_callback), win);
gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0);
entry = entry_attached_to(client, "/apps/gnome/testgconfclient/blah");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
