[atomix] Remove deprecated GTK+ symbols

[Javier Jardón <jjardon src gnome org>]

commit 8f4f4848acdc8f9d04447f8efb2b208fef9c5f37
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Apr 1 00:28:56 2010 +0200

    Remove deprecated GTK+ symbols

 configure.in      |    2 --
 src/preferences.c |   36 +++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/configure.in b/configure.in
index e9d244d..2173306 100644
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,6 @@ dnl ================= Requirements =======================
 LIBGTK_REQUIRED=2.12.0
 LIBXML_REQUIRED=2.4.23
 GDK_PIXBUF_REQUIRED=2.0.5
-#LIBGLADE_REQUIRED=2.0.0
 LIBGNOMECANVAS_REQUIRED=2.0.1
 
 dnl ******************************
@@ -30,7 +29,6 @@ dnl pkg-config checks
 dnl ******************************
 
 ATOMIX_MODULES="gtk+-2.0 >= $LIBGTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED"
-#libglade-2.0 >= $LIBGLADE_REQUIRED
 PKG_CHECK_MODULES(ATOMIX, $ATOMIX_MODULES)
 AC_SUBST(ATOMIX_CFLAGS)
 AC_SUBST(ATOMIX_LIBS)
diff --git a/src/preferences.c b/src/preferences.c
index 1450c14..c23555a 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -96,8 +96,8 @@ void preferences_show_dialog (void)
 
   pref_xml = glade_xml_new (GLADE_FILE, "dlg_properties", NULL);
   dlg = glade_xml_get_widget (pref_xml, "dlg_properties");
-  gtk_signal_connect (GTK_OBJECT (dlg), "apply",
-		      G_CALLBACK (handle_apply), NULL);
+  g_signal_connect (dlg, "apply",
+                    G_CALLBACK (handle_apply), NULL);
 
   /* get widget */
   radio_keyboard = glade_xml_get_widget (pref_xml, "radio_keyboard");
@@ -140,18 +140,18 @@ void preferences_show_dialog (void)
     }
 
   /* connect widgets with handlers */
-  gtk_signal_connect (GTK_OBJECT (radio_mouse), "toggled",
-		      G_CALLBACK (handle_mouse_ctrl_toggled), dlg);
-  gtk_signal_connect (GTK_OBJECT (radio_keyboard), "toggled",
-		      G_CALLBACK (handle_widget_changed), dlg);
-  gtk_signal_connect (GTK_OBJECT (check_hide_cursor), "toggled",
-		      G_CALLBACK (handle_widget_changed), dlg);
-  gtk_signal_connect (GTK_OBJECT (check_lazy_dragging), "toggled",
-		      G_CALLBACK (handle_widget_changed), dlg);
-  gtk_signal_connect (GTK_OBJECT (check_score_time), "toggled",
-		      G_CALLBACK (handle_global_checkbox_toggled), dlg);
-  gtk_signal_connect (GTK_OBJECT (adjustment), "value-changed",
-		      G_CALLBACK (handle_widget_changed), dlg);
+  g_signal_connect (radio_mouse, "toggled",
+                    G_CALLBACK (handle_mouse_ctrl_toggled), dlg);
+  g_signal_connect (radio_keyboard, "toggled",
+                    G_CALLBACK (handle_widget_changed), dlg);
+  g_signal_connect (check_hide_cursor, "toggled",
+                    G_CALLBACK (handle_widget_changed), dlg);
+  g_signal_connect (check_lazy_dragging, "toggled",
+                    G_CALLBACK (handle_widget_changed), dlg);
+  g_signal_connect (check_score_time, "toggled",
+                    G_CALLBACK (handle_global_checkbox_toggled), dlg);
+  g_signal_connect (adjustment, "value-changed",
+                    G_CALLBACK (handle_widget_changed), dlg);
 
   /* show dialog */
   gtk_widget_show (dlg);
@@ -261,9 +261,11 @@ void handle_global_checkbox_toggled (GtkToggleButton *togglebutton,
 
       gtk_widget_set_sensitive (GTK_WIDGET (frame), FALSE);
 
-      gtk_signal_disconnect_by_func (GTK_OBJECT (togglebutton),
-				     G_CALLBACK
-				     (handle_global_checkbox_toggled), data);
+      g_signal_handlers_disconnect_by_func
+                                 (togglebutton,
+                                  G_CALLBACK (handle_global_checkbox_toggled),
+                                  data);
+
       gtk_toggle_button_set_active (togglebutton,
 				    !gtk_toggle_button_get_active
 				    (togglebutton));