Fix a crash with icon themes

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

diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index f006f38054bdc6f95e9959dc3dbd6431e1f7a990..7e89ddf98aae16564730c8a3a246a0649f40be4d 100644 (file)
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -61,6 +61,11 @@ typedef gboolean (*GtkAccelGroupActivate) (GtkAccelGroup  *accel_group,
                                           GObject        *acceleratable,
                                           guint           keyval,
                                           GdkModifierType modifier);
+
+typedef gboolean (*GtkAccelGroupFindFunc) (GtkAccelKey    *key,
+                                          GClosure       *closure,
+                                          gpointer        data);
+
 struct _GtkAccelGroup
 {
   GObject             parent;
@@ -96,7 +101,7 @@ struct _GtkAccelKey
 
 
 /* -- Accelerator Groups --- */
-GType          gtk_accel_group_get_type           (void);
+GType          gtk_accel_group_get_type           (void) G_GNUC_CONST;
 GtkAccelGroup* gtk_accel_group_new               (void);
 void          gtk_accel_group_lock               (GtkAccelGroup  *accel_group);
 void          gtk_accel_group_unlock             (GtkAccelGroup  *accel_group);
@@ -113,6 +118,11 @@ gboolean       gtk_accel_group_disconnect    (GtkAccelGroup  *accel_group,
 gboolean       gtk_accel_group_disconnect_key    (GtkAccelGroup  *accel_group,
                                                   guint           accel_key,
                                                   GdkModifierType accel_mods);
+gboolean       gtk_accel_group_activate           (GtkAccelGroup   *accel_group,
+                                                   GQuark         accel_quark,
+                                                   GObject       *acceleratable,
+                                                   guint          accel_key,
+                                                   GdkModifierType accel_mods);
 
 
 /* --- GtkActivatable glue --- */
@@ -124,11 +134,9 @@ gboolean        gtk_accel_groups_activate          (GObject        *object,
                                                 guint           accel_key,
                                                 GdkModifierType accel_mods);
 GSList*                gtk_accel_groups_from_object    (GObject        *object);
-GtkAccelKey*   gtk_accel_group_find            (GtkAccelGroup  *accel_group,
-                                                gboolean (*find_func) (GtkAccelKey *key,
-                                                                       GClosure    *closure,
-                                                                       gpointer     data),
-                                                gpointer        data);
+GtkAccelKey*   gtk_accel_group_find            (GtkAccelGroup        *accel_group,
+                                                GtkAccelGroupFindFunc find_func,
+                                                gpointer              data);
 GtkAccelGroup* gtk_accel_group_from_accel_closure (GClosure    *closure);
 
 
@@ -140,6 +148,8 @@ void         gtk_accelerator_parse                (const gchar     *accelerator,
                                               GdkModifierType *accelerator_mods);
 gchar*  gtk_accelerator_name                 (guint            accelerator_key,
                                               GdkModifierType  accelerator_mods);
+gchar*   gtk_accelerator_get_label            (guint           accelerator_key,
+                                               GdkModifierType accelerator_mods);
 void    gtk_accelerator_set_default_mod_mask (GdkModifierType  default_mod_mask);
 guint   gtk_accelerator_get_default_mod_mask (void);