diff options
| author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2009-01-23 23:32:40 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2009-01-23 23:32:40 (GMT) |
| commit | 6b4040a40a13ea4f6b63768eb7a40a2ee3ab00b3 (patch) | |
| tree | e6715cd66d3602c1867c600b2b4eec67d58072e4 /cut-n-paste/toolbar-editor/egg-editable-toolbar.c | |
| parent | f10c3f6b0154d1af4a290d759c9cb2b436fe493a (diff) | |
Sync EggToolbarEditor with libegg.
2009-01-24 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
* cut-n-paste/toolbar-editor/egg-editable-toolbar.c
(drag_begin_cb), (drag_end_cb), (configure_item_tooltip),
(new_separator_pixbuf):
* cut-n-paste/toolbar-editor/egg-toolbar-editor.c
(egg_toolbar_editor_disconnect_model),
(egg_toolbar_editor_set_model), (egg_toolbar_editor_class_init),
(egg_toolbar_editor_finalize):
* cut-n-paste/toolbar-editor/egg-toolbar-editor.h:
* cut-n-paste/toolbar-editor/eggmarshalers.list:
Sync EggToolbarEditor with libegg.
svn path=/trunk/; revision=3377
Diffstat (limited to 'cut-n-paste/toolbar-editor/egg-editable-toolbar.c')
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 95b0add..9ad940a 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -200,7 +200,7 @@ drag_begin_cb (GtkWidget *widget, gtk_widget_hide (widget); - action = g_object_get_data (G_OBJECT (widget), "gtk-action"); + action = gtk_widget_get_action (widget); if (action == NULL) return; flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model, @@ -226,7 +226,7 @@ drag_end_cb (GtkWidget *widget, { gtk_widget_show (widget); - action = g_object_get_data (G_OBJECT (widget), "gtk-action"); + action = gtk_widget_get_action (widget); if (action == NULL) return; flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model, @@ -497,8 +497,7 @@ configure_item_cursor (GtkToolItem *item, static void configure_item_tooltip (GtkToolItem *item) { - GtkAction *action = g_object_get_data (G_OBJECT (item), - "gtk-action"); + GtkAction *action = gtk_widget_get_action (GTK_WIDGET (item)); if (action != NULL) { @@ -1808,7 +1807,7 @@ new_pixbuf_from_widget (GtkWidget *widget) } static GdkPixbuf * -new_separator_pixbuf () +new_separator_pixbuf (void) { GtkWidget *separator; GdkPixbuf *pixbuf; |