[gnome-commander/gcmd-1-3] Replacing obsoleted gtk_signal_connect() with g_signal_connect()



commit 1badfa3b7f31f2104f74eb075122f8e7a43d4fac
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sun Dec 6 18:39:06 2009 +0100

    Replacing obsoleted gtk_signal_connect() with g_signal_connect()

 plugins/cvs/cvs-plugin.c                |    2 +-
 plugins/cvs/interface.c                 |   16 +++++++---------
 plugins/fileroller/file-roller-plugin.c |    2 +-
 plugins/test/test-plugin.c              |    2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/plugins/cvs/cvs-plugin.c b/plugins/cvs/cvs-plugin.c
index b16a5bb..63e9992 100644
--- a/plugins/cvs/cvs-plugin.c
+++ b/plugins/cvs/cvs-plugin.c
@@ -178,7 +178,7 @@ static GtkWidget *create_menu_item (const gchar *name, gboolean show_pixmap,
     gtk_object_set_data (GTK_OBJECT (item), GNOMEUIINFO_KEY_UIDATA, data);
 
     if (callback)
-        gtk_signal_connect (GTK_OBJECT (item), "activate", callback, data);
+        g_signal_connect (item, "activate", G_CALLBACK (callback), data);
 
     gtk_object_set_data (GTK_OBJECT (item), "plugin", plugin);
 
diff --git a/plugins/cvs/interface.c b/plugins/cvs/interface.c
index f18af8d..4e3dd49 100644
--- a/plugins/cvs/interface.c
+++ b/plugins/cvs/interface.c
@@ -181,7 +181,7 @@ static GtkWidget *create_compare_win (LogHistory *log_history)
     radio = create_radio (dialog, get_radio_group(radio), _("Other revision"), "other_rev_radio");
     gtk_box_pack_start (GTK_BOX (vbox), radio, TRUE, FALSE, 0);
 
-    gtk_signal_connect (GTK_OBJECT (radio), "toggled", GTK_SIGNAL_FUNC (on_other_rev_toggled), dialog);
+    g_signal_connect (radio, "toggled", G_CALLBACK (on_other_rev_toggled), dialog);
 
     combo = create_combo (dialog);
     gtk_object_set_data_full (GTK_OBJECT (dialog), "rev_combo", combo, (GtkDestroyNotify) gtk_widget_unref);
@@ -261,8 +261,8 @@ GtkWidget *create_diff_win (CvsPlugin *plugin)
         GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE,
         GTK_SIGNAL_FUNC (on_diff_window_close), plugin);
 
-    gtk_signal_connect (GTK_OBJECT (dialog), "delete-event", GTK_SIGNAL_FUNC (on_diff_win_delete), plugin);
-    gtk_signal_connect (GTK_OBJECT (dialog), "destroy-event", GTK_SIGNAL_FUNC (on_diff_win_destroy), plugin);
+    g_signal_connect (dialog, "delete-event", G_CALLBACK (on_diff_win_delete), plugin);
+    g_signal_connect (dialog, "destroy-event", G_CALLBACK (on_diff_win_destroy), plugin);
 
     notebook = gtk_notebook_new ();
     gtk_widget_ref (notebook);
@@ -291,10 +291,8 @@ GtkWidget *create_log_win (CvsPlugin *plugin)
         GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE,
         GTK_SIGNAL_FUNC (on_log_window_close), plugin);
 
-    gtk_signal_connect (GTK_OBJECT (dialog), "delete-event",
-                        GTK_SIGNAL_FUNC (on_log_win_delete), plugin);
-    gtk_signal_connect (GTK_OBJECT (dialog), "destroy-event",
-                        GTK_SIGNAL_FUNC (on_log_win_destroy), plugin);
+    g_signal_connect (dialog, "delete-event", G_CALLBACK (on_log_win_delete), plugin);
+    g_signal_connect (dialog, "destroy-event", G_CALLBACK (on_log_win_destroy), plugin);
 
     notebook = gtk_notebook_new ();
     gtk_widget_ref (notebook);
@@ -329,7 +327,7 @@ static GtkWidget *create_tab_label (GtkWidget *parent,
     gtk_button_set_relief (GTK_BUTTON (btn), GTK_RELIEF_NONE);
     gtk_widget_show (btn);
     gtk_container_add (GTK_CONTAINER (btn), img);
-    gtk_signal_connect (GTK_OBJECT (btn), "clicked", on_close, user_data);
+    g_signal_connect (btn, "clicked", G_CALLBACK (on_close), user_data);
 
     lbl = create_label (hbox, label);
 
@@ -543,7 +541,7 @@ void add_log_tab (CvsPlugin *plugin, const gchar *fname)
         gtk_clist_set_row_data (GTK_CLIST (rev_list), row, rev);
     }
 
-    gtk_signal_connect (GTK_OBJECT (rev_list), "select-row", GTK_SIGNAL_FUNC (on_rev_list_select_row), log_history);
+    g_signal_connect (rev_list, "select-row", G_CALLBACK (on_rev_list_select_row), log_history);
 
     gtk_clist_select_row (GTK_CLIST (rev_list), 0, 0);
 }
diff --git a/plugins/fileroller/file-roller-plugin.c b/plugins/fileroller/file-roller-plugin.c
index fce9a55..420a686 100644
--- a/plugins/fileroller/file-roller-plugin.c
+++ b/plugins/fileroller/file-roller-plugin.c
@@ -263,7 +263,7 @@ static GtkWidget *create_menu_item (const gchar *name, gboolean show_pixmap,
     gtk_object_set_data (GTK_OBJECT (item), GNOMEUIINFO_KEY_UIDATA, data);
 
     if (callback)
-        gtk_signal_connect (GTK_OBJECT (item), "activate", callback, data);
+        g_signal_connect (item, "activate", G_CALLBACK (callback), data);
 
     return item;
 }
diff --git a/plugins/test/test-plugin.c b/plugins/test/test-plugin.c
index 66de78f..b3e4afb 100644
--- a/plugins/test/test-plugin.c
+++ b/plugins/test/test-plugin.c
@@ -89,7 +89,7 @@ static GtkWidget *create_menu_item (const gchar *name, gboolean show_pixmap, Gtk
     gtk_object_set_data (GTK_OBJECT (item), GNOMEUIINFO_KEY_UIDATA, data);
 
     if (callback)
-        gtk_signal_connect (GTK_OBJECT (item), "activate", callback, data);
+        g_signal_connect (item, "activate", G_CALLBACK (callback), data);
 
     return item;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]