diff --git a/ChangeLog b/ChangeLog index c3833d7310de8c1bcb7dde27fdbb66144a7e1f43..09d3afbe0a45c07ab5a9e88fc7fb111fa6ac7387 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-12-28 Michael Natterer + + * app/widgets/gimpwidgets-utils.[ch]: removed + gimp_action_get_accel_closure(). + + * app/widgets/gimpactionview.c (gimp_action_view_new): use + gtk_action_get_accel_closure() instead. + 2005-12-28 Michael Natterer * configure.in: bump version to 2.3.7, diff --git a/app/widgets/gimpactionview.c b/app/widgets/gimpactionview.c index 597d543ed06825a19fb8a916537e6e437fb5d67e..5351a15d9d949e8bb241b737c1ec7628aff7d2fc 100644 --- a/app/widgets/gimpactionview.c +++ b/app/widgets/gimpactionview.c @@ -241,7 +241,7 @@ gimp_action_view_new (GimpUIManager *manager, if (show_shortcuts) { - accel_closure = gimp_action_get_accel_closure (action); + accel_closure = gtk_action_get_accel_closure (action); if (accel_closure) { diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c index 94ddba5153f828ffecdaa47a68baaa1870d8bea3..0fbb5ddee12a61c8c7fb3d06c04d3510e9ae2aaf 100644 --- a/app/widgets/gimpwidgets-utils.c +++ b/app/widgets/gimpwidgets-utils.c @@ -894,36 +894,6 @@ gimp_toggle_button_set_visible (GtkToggleButton *toggle, gtk_widget_hide (widget); } -#ifdef __GNUC__ -#warning FIXME: remove this function as soon as we depend on GTK >= 2.8 -#endif -GClosure * -gimp_action_get_accel_closure (GtkAction *action) -{ - GtkWidget *menu_item; - GClosure *closure = NULL; - - g_return_val_if_fail (GTK_IS_ACTION (action), NULL); - - menu_item = gtk_action_create_menu_item (action); - - if (GTK_IS_MENU_ITEM (menu_item) && - GTK_IS_ACCEL_LABEL (GTK_BIN (menu_item)->child)) - { - GtkWidget *accel_label = GTK_BIN (menu_item)->child; - - g_object_get (accel_label, "accel-closure", &closure, NULL); - } - - if (menu_item) - gtk_object_sink (GTK_OBJECT (menu_item)); - - if (closure) - g_closure_unref (closure); - - return closure; -} - static gboolean gimp_widget_accel_find_func (GtkAccelKey *key, GClosure *closure, @@ -989,7 +959,7 @@ gimp_widget_set_accel_help (GtkWidget *widget, { GClosure *accel_closure = NULL; - accel_closure = gimp_action_get_accel_closure (action); + accel_closure = gtk_action_get_accel_closure (action); if (accel_closure) { diff --git a/app/widgets/gimpwidgets-utils.h b/app/widgets/gimpwidgets-utils.h index eb1d5e451551658891b07045f6f8f6349730e9ea..4b7e32d3c477827284f45a9499ec7723139b8e1e 100644 --- a/app/widgets/gimpwidgets-utils.h +++ b/app/widgets/gimpwidgets-utils.h @@ -83,8 +83,6 @@ gboolean gimp_text_buffer_save (GtkTextBuffer *buffer, void gimp_toggle_button_set_visible (GtkToggleButton *toggle, GtkWidget *widget); -GClosure * gimp_action_get_accel_closure (GtkAction *action); - void gimp_widget_set_accel_help (GtkWidget *widget, GtkAction *action);