[telegnome] * src/prefs.c (prefs_show, construct_channels_page, edit_channel):

[Colin Watson <cjwatson src gnome org>]

commit 3715e3febb7ea275fab23a97b15844f3face66b2
Author: Colin Watson <cjwatson debian org>
Date:   Tue Apr 28 23:53:35 2009 +0100

    * src/prefs.c (prefs_show, construct_channels_page, edit_channel):
    Convert from GTK+ signals to GLib signals.
    * src/gui.c (new_toolbar): Likewise (albeit in commented-out code).
---
 ChangeLog   |    6 ++++++
 src/gui.c   |    2 +-
 src/prefs.c |   48 ++++++++++++++++++++++++------------------------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58bda5e..7f70b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-28  Colin Watson  <cjwatson debian org>
 
+	* src/prefs.c (prefs_show, construct_channels_page, edit_channel):
+	Convert from GTK+ signals to GLib signals.
+	* src/gui.c (new_toolbar): Likewise (albeit in commented-out code).
+
+2009-04-28  Colin Watson  <cjwatson debian org>
+
 	Update intltool handling.
 
 	* telegnome.desktop: Rename to ...
diff --git a/src/gui.c b/src/gui.c
index dbe994b..920a6c4 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -308,7 +308,7 @@ new_toolbar ()
     w = gtk_toggle_button_new();
     gui.zoombutton = w;
     gtk_container_add(GTK_CONTAINER(w), gui.zoomlabel);
-    gtk_signal_connect(GTK_OBJECT(w), "clicked", cb_zoom, NULL);
+    g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(cb_zoom), NULL);
     gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), w, _("Toggles zooming"), NULL);
     */
 
diff --git a/src/prefs.c b/src/prefs.c
index 915f829..727ffc0 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -106,18 +106,18 @@ prefs_show(void)
 	gtk_notebook_set_show_border (GTK_NOTEBOOK(prefs_window->box->notebook),
 				      TRUE);
 
-	gtk_signal_connect (GTK_OBJECT (prefs_window->box), "apply",
-			    GTK_SIGNAL_FUNC (prefs_apply_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (prefs_window->box), "destroy",
-			    GTK_SIGNAL_FUNC (prefs_cancel_cb), NULL);
-
-	gtk_signal_connect_object(GTK_OBJECT(prefs_window->interval_entry), "changed",
-				  GTK_SIGNAL_FUNC(gnome_property_box_changed),
-				  GTK_OBJECT(prefs_window->box));
+	g_signal_connect (G_OBJECT (prefs_window->box), "apply",
+			  G_CALLBACK (prefs_apply_cb), NULL);
+	g_signal_connect (G_OBJECT (prefs_window->box), "destroy",
+			  G_CALLBACK (prefs_cancel_cb), NULL);
+
+	g_signal_connect_swapped(G_OBJECT(prefs_window->interval_entry), "changed",
+				 G_CALLBACK(gnome_property_box_changed),
+				 G_OBJECT(prefs_window->box));
 	
-	gtk_signal_connect_object(GTK_OBJECT(prefs_window->proxy_entry), "changed",
-				  GTK_SIGNAL_FUNC(gnome_property_box_changed),
-				  GTK_OBJECT(prefs_window->box));
+	g_signal_connect_swapped(G_OBJECT(prefs_window->proxy_entry), "changed",
+				 G_CALLBACK(gnome_property_box_changed),
+				 G_OBJECT(prefs_window->box));
 
 
 	/* and, show them all */
@@ -216,9 +216,9 @@ construct_channels_page()
     /* fill channel list */
     fill_channel_list();
     
-    gtk_signal_connect(GTK_OBJECT(prefs_window->channel_list), "select_row",
-		       GTK_SIGNAL_FUNC(prefs_channel_list_click_cb),
-		       NULL);
+    g_signal_connect(G_OBJECT(prefs_window->channel_list), "select_row",
+		     G_CALLBACK(prefs_channel_list_click_cb),
+		     NULL);
 
     vbox = gtk_vbox_new(TRUE, 0);
     
@@ -226,29 +226,29 @@ construct_channels_page()
     btn = gtk_button_new_with_label(_("Move up"));
     /* btn = gnome_stock_or_ordinary_button(GNOME_STOCK_PIXMAP_ADD); */
     gtk_box_pack_start(GTK_BOX(vbox), btn, FALSE, FALSE, 2);
-    gtk_signal_connect(GTK_OBJECT(btn), "clicked", GTK_SIGNAL_FUNC(prefs_channel_move_up_cb), NULL);
+    g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(prefs_channel_move_up_cb), NULL);
     /* move down button */
     btn = gtk_button_new_with_label(_("Move down"));
     /* btn = gnome_stock_or_ordinary_button(GNOME_STOCK_PIXMAP_ADD); */
     gtk_box_pack_start(GTK_BOX(vbox), btn, FALSE, FALSE, 2);
-    gtk_signal_connect(GTK_OBJECT(btn), "clicked", GTK_SIGNAL_FUNC(prefs_channel_move_down_cb), NULL);
+    g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(prefs_channel_move_down_cb), NULL);
     /* add button */
     btn = gtk_button_new_with_label(_("Add..."));
     /* btn = gnome_stock_or_ordinary_button(GNOME_STOCK_PIXMAP_ADD); */
     gtk_box_pack_start(GTK_BOX(vbox), btn, FALSE, FALSE, 2);
-    gtk_signal_connect(GTK_OBJECT(btn), "clicked", GTK_SIGNAL_FUNC(prefs_channel_add_cb), NULL);
+    g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(prefs_channel_add_cb), NULL);
 
     /* delete button */
     btn = gtk_button_new_with_label(_("Delete"));
     /* btn = gnome_stock_or_ordinary_button(GNOME_STOCK_PIXMAP_REMOVE); */
     gtk_box_pack_start(GTK_BOX(vbox), btn, FALSE, FALSE, 2);
-    gtk_signal_connect(GTK_OBJECT(btn), "clicked", GTK_SIGNAL_FUNC(prefs_channel_delete_cb), NULL);
+    g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(prefs_channel_delete_cb), NULL);
 
     /* edit buton */
     btn = gtk_button_new_with_label(_("Edit"));
     /* btn = gnome_stock_or_ordinary_button(GNOME_STOCK_PIXMAP_PROPERTIES); */
     gtk_box_pack_start(GTK_BOX(vbox), btn, FALSE, FALSE, 2);
-    gtk_signal_connect(GTK_OBJECT(btn), "clicked", GTK_SIGNAL_FUNC(prefs_channel_edit_cb), NULL);
+    g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(prefs_channel_edit_cb), NULL);
 
     gtk_box_pack_start_defaults(GTK_BOX(hbox), vbox);
     
@@ -289,7 +289,7 @@ edit_channel(Channel *orig)
     gtk_entry_set_text(GTK_ENTRY(name), orig->name->str);
     gtk_table_attach_defaults(GTK_TABLE(table), label, 0,1, 0,1);
     gtk_table_attach_defaults(GTK_TABLE(table), name, 1,2, 0,1);
-    gtk_signal_connect(GTK_OBJECT(name), "changed", GTK_SIGNAL_FUNC(edit_channel_changed), (gpointer)dialog);
+    g_signal_connect(G_OBJECT(name), "changed", G_CALLBACK(edit_channel_changed), (gpointer)dialog);
 
     label = gtk_label_new(_("Description"));
     gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -297,7 +297,7 @@ edit_channel(Channel *orig)
     gtk_entry_set_text(GTK_ENTRY(desc), orig->desc->str);
     gtk_table_attach_defaults(GTK_TABLE(table), label, 0,1, 1,2);
     gtk_table_attach_defaults(GTK_TABLE(table), desc,  1,2, 1,2);
-    gtk_signal_connect(GTK_OBJECT(desc), "changed", GTK_SIGNAL_FUNC(edit_channel_changed), (gpointer)dialog);
+    g_signal_connect(G_OBJECT(desc), "changed", G_CALLBACK(edit_channel_changed), (gpointer)dialog);
 
     label = gtk_label_new(_("Page url"));
     gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -305,7 +305,7 @@ edit_channel(Channel *orig)
     gtk_entry_set_text(GTK_ENTRY(page), orig->page_url->str);
     gtk_table_attach_defaults(GTK_TABLE(table), label, 0,1, 2,3);
     gtk_table_attach_defaults(GTK_TABLE(table), page,  1,2, 2,3);
-    gtk_signal_connect(GTK_OBJECT(page), "changed", GTK_SIGNAL_FUNC(edit_channel_changed), (gpointer)dialog);
+    g_signal_connect(G_OBJECT(page), "changed", G_CALLBACK(edit_channel_changed), (gpointer)dialog);
 
     label = gtk_label_new(_("Subpage url"));
     gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -313,7 +313,7 @@ edit_channel(Channel *orig)
     gtk_entry_set_text(GTK_ENTRY(subpage), orig->subpage_url->str);
     gtk_table_attach_defaults(GTK_TABLE(table), label, 0,1,    3,4);
     gtk_table_attach_defaults(GTK_TABLE(table), subpage,  1,2, 3,4);
-    gtk_signal_connect(GTK_OBJECT(subpage), "changed", GTK_SIGNAL_FUNC(edit_channel_changed), (gpointer)dialog);
+    g_signal_connect(G_OBJECT(subpage), "changed", G_CALLBACK(edit_channel_changed), (gpointer)dialog);
 
     label = gtk_label_new(_("Country"));
     gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -321,7 +321,7 @@ edit_channel(Channel *orig)
     gtk_entry_set_text(GTK_ENTRY(country), orig->country->str);
     gtk_table_attach_defaults(GTK_TABLE(table), label, 0,1, 4,5);
     gtk_table_attach_defaults(GTK_TABLE(table), country,  1,2, 4,5);
-    gtk_signal_connect(GTK_OBJECT(country), "changed", GTK_SIGNAL_FUNC(edit_channel_changed), (gpointer)dialog);
+    g_signal_connect(G_OBJECT(country), "changed", G_CALLBACK(edit_channel_changed), (gpointer)dialog);
 
     frame = gtk_frame_new(_("Channel Information"));
     gtk_container_add(GTK_CONTAINER(frame), table);