remove _gtk_binding_signal_new().

2008-07-21  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkbindings.[ch]: remove _gtk_binding_signal_new().

	* gtk/gtkfilechooserdefault.c
	* gtk/gtkmenu.c
	* gtk/gtkmenushell.c
	* gtk/gtkscalebutton.c
	* gtk/gtktextview.c
	* gtk/gtktoolbar.c
	* gtk/gtkwidget.c: use g_signal_new_class_handler() instead. Add
	some missing I_() to the signal names.


svn path=/trunk/; revision=20874

10 files changed, 199 insertions, 227 deletions

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index 8924180a55..85734f770e 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -1698,34 +1698,5 @@ _gtk_binding_reset_parsed (void)
     }
 }
 
-guint
-_gtk_binding_signal_new (const gchar	    *signal_name,
-			 GType		     itype,
-			 GSignalFlags	     signal_flags,
-			 GCallback           handler,
-			 GSignalAccumulator  accumulator,
-			 gpointer	     accu_data,
-			 GSignalCMarshaller  c_marshaller,
-			 GType		     return_type,
-			 guint		     n_params,
-			 ...)
-{
-  va_list args;
-  guint signal_id;
-
-  g_return_val_if_fail (signal_name != NULL, 0);
-  
-  va_start (args, n_params);
-
-  signal_id = g_signal_new_valist (signal_name, itype, signal_flags,
-                                   g_cclosure_new (handler, NULL, NULL),
-				   accumulator, accu_data, c_marshaller,
-                                   return_type, n_params, args);
-
-  va_end (args);
- 
-  return signal_id;
-}
-
 #define __GTK_BINDINGS_C__
 #include "gtkaliasdef.c"
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 8d679cd80f..f37a673a31 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -154,21 +154,6 @@ void	 _gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
 					 const gchar	*signal_name,
 					 GSList		*binding_args);
 
-/* Creates a signal with a fixed callback instead of a class offset;
- * useful for key binding signals
- */
-guint _gtk_binding_signal_new (const gchar       *signal_name,
-			       GType		  itype,
-			       GSignalFlags	  signal_flags,
-			       GCallback          handler,
-			       GSignalAccumulator accumulator,
-			       gpointer		  accu_data,
-			       GSignalCMarshaller c_marshaller,
-			       GType		  return_type,
-			       guint		  n_params,
-			       ...);
-
 G_END_DECLS
 
-
 #endif /* __GTK_BINDINGS_H__ */
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index cf2ddff020..14a6bec9df 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -540,14 +540,14 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * Since: 2.12
    */
   combo_box_signals[MOVE_ACTIVE] =
-    _gtk_binding_signal_new (I_("move-active"),
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_combo_box_real_move_active),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__ENUM,
-                             G_TYPE_NONE, 1,
-                             GTK_TYPE_SCROLL_TYPE);
+    g_signal_new_class_handler (I_("move-active"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_combo_box_real_move_active),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__ENUM,
+                                G_TYPE_NONE, 1,
+                                GTK_TYPE_SCROLL_TYPE);
 
   /**
    * GtkComboBox::popup:
@@ -562,13 +562,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * Since: 2.12
    */
   combo_box_signals[POPUP] =
-    _gtk_binding_signal_new (I_("popup"),
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_combo_box_real_popup),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("popup"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_combo_box_real_popup),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
   /**
    * GtkComboBox::popdown:
    * @button: the object which received the signal
@@ -582,13 +582,13 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * Since: 2.12
    */
   combo_box_signals[POPDOWN] =
-    _gtk_binding_signal_new (I_("popdown"),
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_combo_box_real_popdown),
-                             NULL, NULL,
-                             _gtk_marshal_BOOLEAN__VOID,
-                             G_TYPE_BOOLEAN, 0);
+    g_signal_new_class_handler (I_("popdown"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_combo_box_real_popdown),
+                                NULL, NULL,
+                                _gtk_marshal_BOOLEAN__VOID,
+                                G_TYPE_BOOLEAN, 0);
 
   /* key bindings */
   binding_set = gtk_binding_set_by_class (widget_class);
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 8a6f0975c5..668f61829a 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -570,93 +570,103 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
   widget_class->size_allocate = gtk_file_chooser_default_size_allocate;
 
   signals[LOCATION_POPUP] =
-    _gtk_binding_signal_new (I_("location-popup"),
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (location_popup_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__STRING,
-			     G_TYPE_NONE, 1, G_TYPE_STRING);
+    g_signal_new_class_handler (I_("location-popup"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (location_popup_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__STRING,
+                                G_TYPE_NONE, 1, G_TYPE_STRING);
+
   signals[LOCATION_POPUP_ON_PASTE] =
-    _gtk_binding_signal_new ("location-popup-on-paste",
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (location_popup_on_paste_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("location-popup-on-paste"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (location_popup_on_paste_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[LOCATION_TOGGLE_POPUP] =
-    _gtk_binding_signal_new (I_("location-toggle-popup"),
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (location_toggle_popup_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("location-toggle-popup"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (location_toggle_popup_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[UP_FOLDER] =
-    _gtk_binding_signal_new (I_("up-folder"),
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (up_folder_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("up-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (up_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[DOWN_FOLDER] =
-    _gtk_binding_signal_new (I_("down-folder"),
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (down_folder_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("down-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (down_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[HOME_FOLDER] =
-    _gtk_binding_signal_new (I_("home-folder"),
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (home_folder_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("home-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (home_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[DESKTOP_FOLDER] =
-    _gtk_binding_signal_new (I_("desktop-folder"),
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (desktop_folder_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("desktop-folder"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (desktop_folder_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[QUICK_BOOKMARK] =
-    _gtk_binding_signal_new (I_("quick-bookmark"),
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (quick_bookmark_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__INT,
-			     G_TYPE_NONE, 1, G_TYPE_INT);
+    g_signal_new_class_handler (I_("quick-bookmark"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (quick_bookmark_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__INT,
+                                G_TYPE_NONE, 1, G_TYPE_INT);
+
   signals[SHOW_HIDDEN] =
-    _gtk_binding_signal_new ("show-hidden",
-			     G_OBJECT_CLASS_TYPE (class),
-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-			     G_CALLBACK (show_hidden_handler),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("show-hidden"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (show_hidden_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[SEARCH_SHORTCUT] =
-    _gtk_binding_signal_new ("search-shortcut",
-                             G_OBJECT_CLASS_TYPE (class),
-                             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                             G_CALLBACK (search_shortcut_handler),
-                             NULL, NULL,
-                             _gtk_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("search-shortcut"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (search_shortcut_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
+
   signals[RECENT_SHORTCUT] =
-    _gtk_binding_signal_new ("recent-shortcut",
-                             G_OBJECT_CLASS_TYPE (class),
-                             G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-                             G_CALLBACK (recent_shortcut_handler),
-                             NULL, NULL,
-                             _gtk_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("recent-shortcut"),
+                                G_OBJECT_CLASS_TYPE (class),
+                                G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                                G_CALLBACK (recent_shortcut_handler),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   binding_set = gtk_binding_set_by_class (class);
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 2af59de630..79caf7e3ec 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -479,14 +479,14 @@ gtk_menu_class_init (GtkMenuClass *class)
   menu_shell_class->move_current = gtk_menu_move_current;
 
   menu_signals[MOVE_SCROLL] =
-    _gtk_binding_signal_new (I_("move_scroll"),
-			     G_OBJECT_CLASS_TYPE (object_class),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_menu_real_move_scroll),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__ENUM,
-			     G_TYPE_NONE, 1,
-			     GTK_TYPE_SCROLL_TYPE);
+    g_signal_new_class_handler (I_("move_scroll"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_menu_real_move_scroll),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM,
+                                G_TYPE_NONE, 1,
+                                GTK_TYPE_SCROLL_TYPE);
 
   /**
    * GtkMenu:active:
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 6eac58ab09..f2ca2dcdf0 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -250,6 +250,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
 		  NULL, NULL,
 		  _gtk_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
+
   menu_shell_signals[SELECTION_DONE] =
     g_signal_new (I_("selection-done"),
 		  G_OBJECT_CLASS_TYPE (object_class),
@@ -258,6 +259,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
 		  NULL, NULL,
 		  _gtk_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
+
   menu_shell_signals[MOVE_CURRENT] =
     g_signal_new (I_("move_current"),
 		  G_OBJECT_CLASS_TYPE (object_class),
@@ -265,8 +267,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
 		  G_STRUCT_OFFSET (GtkMenuShellClass, move_current),
 		  NULL, NULL,
 		  _gtk_marshal_VOID__ENUM,
-		  G_TYPE_NONE, 1, 
+		  G_TYPE_NONE, 1,
 		  GTK_TYPE_MENU_DIRECTION_TYPE);
+
   menu_shell_signals[ACTIVATE_CURRENT] =
     g_signal_new (I_("activate_current"),
 		  G_OBJECT_CLASS_TYPE (object_class),
@@ -274,8 +277,9 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
 		  G_STRUCT_OFFSET (GtkMenuShellClass, activate_current),
 		  NULL, NULL,
 		  _gtk_marshal_VOID__BOOLEAN,
-		  G_TYPE_NONE, 1, 
+		  G_TYPE_NONE, 1,
 		  G_TYPE_BOOLEAN);
+
   menu_shell_signals[CANCEL] =
     g_signal_new (I_("cancel"),
 		  G_OBJECT_CLASS_TYPE (object_class),
@@ -284,27 +288,29 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
 		  NULL, NULL,
 		  _gtk_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
+
   menu_shell_signals[CYCLE_FOCUS] =
-    _gtk_binding_signal_new (I_("cycle_focus"),
-			     G_OBJECT_CLASS_TYPE (object_class),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_real_menu_shell_cycle_focus),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__ENUM,
-			     G_TYPE_NONE, 1,
-			     GTK_TYPE_DIRECTION_TYPE);
+    g_signal_new_class_handler (I_("cycle_focus"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_real_menu_shell_cycle_focus),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM,
+                                G_TYPE_NONE, 1,
+                                GTK_TYPE_DIRECTION_TYPE);
+
   /**
    * GtkMenuShell::move-selected:
    * @menu_shell: the object on which the signal is emitted
    * @distance: +1 to move to the next item, -1 to move to the previous
    *
    * The ::move-selected signal is emitted to move the selection to
-   * another item. 
-   * 
+   * another item.
+   *
    * Returns: %TRUE to stop the signal emission, %FALSE to continue
    *
    * Since: 2.12
-   */ 
+   */
   menu_shell_signals[MOVE_SELECTED] =
     g_signal_new (I_("move_selected"),
 		  G_OBJECT_CLASS_TYPE (object_class),
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index d8adb52e9f..27b9be450d 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -282,13 +282,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
    * Since: 2.12
    */
   signals[POPUP] =
-    _gtk_binding_signal_new (I_("popup"),
-			     G_OBJECT_CLASS_TYPE (klass),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_scale_button_popup),
-			     NULL, NULL,
-			     g_cclosure_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("popup"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_scale_button_popup),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   /**
    * GtkScaleButton::popdown:
@@ -303,13 +303,13 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
    * Since: 2.12
    */
   signals[POPDOWN] =
-    _gtk_binding_signal_new (I_("popdown"),
-			     G_OBJECT_CLASS_TYPE (klass),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_scale_button_popdown),
-			     NULL, NULL,
-			     g_cclosure_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("popdown"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_scale_button_popdown),
+                                NULL, NULL,
+                                g_cclosure_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   /* Key bindings */
   binding_set = gtk_binding_set_by_class (widget_class);
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 75b73bdf9e..5a2b689166 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -756,15 +756,15 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * There are no default bindings for this signal.
    */
   signals[MOVE_VIEWPORT] =
-    _gtk_binding_signal_new (I_("move_viewport"),
-			     G_OBJECT_CLASS_TYPE (gobject_class),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_text_view_move_viewport),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__ENUM_INT,
-			     G_TYPE_NONE, 2,
-			     GTK_TYPE_SCROLL_STEP,
-			     G_TYPE_INT);
+    g_signal_new_class_handler (I_("move_viewport"),
+                                G_OBJECT_CLASS_TYPE (gobject_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_text_view_move_viewport),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM_INT,
+                                G_TYPE_NONE, 2,
+                                GTK_TYPE_SCROLL_STEP,
+                                G_TYPE_INT);
 
   signals[SET_ANCHOR] =
     g_signal_new (I_("set_anchor"),
@@ -951,13 +951,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * for selecting and Shift-Ctrl-a and Ctrl-\ for unselecting.
    */
   signals[SELECT_ALL] =
-    _gtk_binding_signal_new (I_("select_all"),
-			     G_OBJECT_CLASS_TYPE (object_class),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_text_view_select_all),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__BOOLEAN,
-			     G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+    g_signal_new_class_handler (I_("select_all"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_text_view_select_all),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__BOOLEAN,
+                                G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
   /**
    * GtkTextView::toggle-cursor-visible:
@@ -970,13 +970,13 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    * The default binding for this signal is F7.
    */ 
   signals[TOGGLE_CURSOR_VISIBLE] =
-    _gtk_binding_signal_new (I_("toggle_cursor_visible"),
-			     G_OBJECT_CLASS_TYPE (object_class),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_text_view_toggle_cursor_visible),
-			     NULL, NULL,
-			     _gtk_marshal_VOID__VOID,
-			     G_TYPE_NONE, 0);
+    g_signal_new_class_handler (I_("toggle_cursor_visible"),
+                                G_OBJECT_CLASS_TYPE (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_text_view_toggle_cursor_visible),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__VOID,
+                                G_TYPE_NONE, 0);
 
   /*
    * Key bindings
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index c7b17e4d1f..e2445c04e6 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -478,15 +478,15 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
    * Return value: %TRUE if the signal was handled, %FALSE if not
    */
   toolbar_signals[FOCUS_HOME_OR_END] =
-    _gtk_binding_signal_new (I_("focus_home_or_end"),
-			     G_OBJECT_CLASS_TYPE (klass),
-			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_toolbar_focus_home_or_end),
-			     NULL, NULL,
-			     _gtk_marshal_BOOLEAN__BOOLEAN,
-			     G_TYPE_BOOLEAN, 1,
-			     G_TYPE_BOOLEAN);
-  
+    g_signal_new_class_handler (I_("focus_home_or_end"),
+                                G_OBJECT_CLASS_TYPE (klass),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_toolbar_focus_home_or_end),
+                                NULL, NULL,
+                                _gtk_marshal_BOOLEAN__BOOLEAN,
+                                G_TYPE_BOOLEAN, 1,
+                                G_TYPE_BOOLEAN);
+
   /* properties */
   g_object_class_install_property (gobject_class,
 				   PROP_ORIENTATION,
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 686b0c1266..3d36038565 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -914,15 +914,15 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 		  G_TYPE_BOOLEAN, 1,
 		  GTK_TYPE_DIRECTION_TYPE);
   widget_signals[MOVE_FOCUS] =
-    _gtk_binding_signal_new (I_("move_focus"),
-                             G_TYPE_FROM_CLASS (object_class),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_CALLBACK (gtk_widget_real_move_focus),
-                             NULL, NULL,
-                             _gtk_marshal_VOID__ENUM,
-                             G_TYPE_NONE,
-                             1,
-                             GTK_TYPE_DIRECTION_TYPE);
+    g_signal_new_class_handler (I_("move_focus"),
+                                G_TYPE_FROM_CLASS (object_class),
+                                G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                                G_CALLBACK (gtk_widget_real_move_focus),
+                                NULL, NULL,
+                                _gtk_marshal_VOID__ENUM,
+                                G_TYPE_NONE,
+                                1,
+                                GTK_TYPE_DIRECTION_TYPE);
   /**
    * GtkWidget::event:
    * @widget: the object which received the signal.
@@ -1106,14 +1106,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * Since: 2.12
    **/
   widget_signals[KEYNAV_FAILED] =
-    _gtk_binding_signal_new (I_("keynav-failed"),
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_LAST,
-                             G_CALLBACK (gtk_widget_real_keynav_failed),
-                             _gtk_boolean_handled_accumulator, NULL,
-                             _gtk_marshal_BOOLEAN__ENUM,
-                             G_TYPE_BOOLEAN, 1,
-                             GTK_TYPE_DIRECTION_TYPE);
+    g_signal_new_class_handler (I_("keynav-failed"),
+                                G_TYPE_FROM_CLASS (gobject_class),
+                                G_SIGNAL_RUN_LAST,
+                                G_CALLBACK (gtk_widget_real_keynav_failed),
+                                _gtk_boolean_handled_accumulator, NULL,
+                                _gtk_marshal_BOOLEAN__ENUM,
+                                G_TYPE_BOOLEAN, 1,
+                                GTK_TYPE_DIRECTION_TYPE);
 
   /**
    * GtkWidget::delete-event: