Add @INTLLIBS@. gtk-scier-981116-0.patch Sean Cier

[~andy/gtk] / gtk / gtkaccelgroup.c

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 9a65f07318d0537c24539080cd0e4b639c231514..f929912fbe9103eecdd5492ce6b48bd34222e880 100644 (file)
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -376,9 +376,13 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
                 "cannot be used as accelerator signal",
                 accel_signal,
                 gtk_type_name (GTK_OBJECT_TYPE (object)));
+      if (query)
+       g_free (query);
+
       return;
     }
-  
+  g_free (query);
+
   /* prematurely abort if the group/entry is already locked
    */
   if (accel_group->lock_count > 0)
@@ -649,7 +653,7 @@ gtk_accel_group_create_add (GtkType          class_type,
                         signal_flags,
                         class_type,
                         handler_offset,
-                        gtk_accel_group_marshal_add,
+                        gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM,
                         GTK_TYPE_NONE, 5,
                         GTK_TYPE_UINT,
                         GTK_TYPE_ACCEL_GROUP,
@@ -669,49 +673,13 @@ gtk_accel_group_create_remove (GtkType          class_type,
                         signal_flags,
                         class_type,
                         handler_offset,
-                        gtk_accel_group_marshal_remove,
+                        gtk_marshal_NONE__POINTER_UINT_UINT,
                         GTK_TYPE_NONE, 3,
                         GTK_TYPE_ACCEL_GROUP,
                         GTK_TYPE_UINT,
                         GTK_TYPE_GDK_MODIFIER_TYPE);
 }
 
-void
-gtk_accel_group_marshal_add (GtkObject     *object,
-                            GtkSignalFunc   func,
-                            gpointer        func_data,
-                            GtkArg         *args)
-{
-  GtkSignalAddAccelerator signal_func;
-  
-  signal_func = (GtkSignalAddAccelerator) func;
-  
-  signal_func (object,
-              GTK_VALUE_UINT (args[0]),
-              GTK_VALUE_BOXED (args[1]),
-              GTK_VALUE_UINT (args[2]),
-              GTK_VALUE_UINT (args[3]),
-              GTK_VALUE_ENUM (args[4]),
-              func_data);
-}
-
-void
-gtk_accel_group_marshal_remove (GtkObject      *object,
-                               GtkSignalFunc    func,
-                               gpointer         func_data,
-                               GtkArg          *args)
-{
-  GtkSignalRemoveAccelerator signal_func;
-  
-  signal_func = (GtkSignalRemoveAccelerator) func;
-  
-  signal_func (object,
-              GTK_VALUE_BOXED (args[0]),
-              GTK_VALUE_UINT (args[1]),
-              GTK_VALUE_UINT (args[2]),
-              func_data);
-}
-
 GSList*
 gtk_accel_groups_from_object (GtkObject             *object)
 {
@@ -732,9 +700,9 @@ gtk_accel_group_entries_from_object (GtkObject           *object)
 
 gboolean
 gtk_accelerator_valid (guint             keyval,
-                      guint              modifiers)
+                      GdkModifierType    modifiers)
 {
-  guint invalid_accelerator_vals[] = {
+  static const guint invalid_accelerator_vals[] = {
     GDK_BackSpace, GDK_Delete, GDK_KP_Delete,
     GDK_Shift_L, GDK_Shift_R, GDK_Shift_Lock, GDK_Caps_Lock, GDK_ISO_Lock,
     GDK_Control_L, GDK_Control_R, GDK_Meta_L, GDK_Meta_R,
@@ -912,7 +880,7 @@ gtk_accelerator_parse (const gchar    *accelerator,
            }
          else if (len >= 6 && is_modx (accelerator))
            {
-             guint mod_vals[] = {
+             static const guint mod_vals[] = {
                GDK_MOD1_MASK, GDK_MOD2_MASK, GDK_MOD3_MASK,
                GDK_MOD4_MASK, GDK_MOD5_MASK
              };
@@ -1052,7 +1020,7 @@ gtk_accelerator_name (guint           accelerator_key,
 }
 
 void
-gtk_accelerator_set_default_mod_mask (guint           default_mod_mask)
+gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask)
 {
   default_accel_mod_mask = default_mod_mask & GDK_MODIFIER_MASK;
 }