diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-04-02 02:48:50 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-04-02 02:48:50 +0800 |
| commit | 1bf392262548cf4c6779e1bc6c550b3605aba733 (patch) | |
| tree | cf7ef737a899cb44d44d4270a788b5a7ebdcc964 /lib/egg/egg-action.c | |
| parent | a040bc3b4be4f80ae661b7f2a88c78d29c480e65 (diff) | |
| download | gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.gz gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.bz2 gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.lz gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.xz gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.zst gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.zip | |
Use EggEditableToolbar. Update to latest versions (not EggMenuMerge, we
2003-04-01 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/egg/Makefile.am:
* lib/egg/egg-accel-dialog.c:
* lib/egg/egg-action-group.c:
* lib/egg/egg-action.c:
* lib/egg/egg-editable-toolbar.c:
* lib/egg/egg-editable-toolbar.h:
* lib/egg/egg-radio-action.c:
* lib/egg/egg-toggle-action.c:
* lib/egg/egg-toolbars-group.c:
* lib/egg/egg-toolbars-group.h:
* lib/egg/eggintl.h:
* lib/egg/eggtoolbar.c:
* lib/egg/eggtoolbutton.c:
* lib/egg/update-from-egg.sh:
Use EggEditableToolbar.
Update to latest versions (not EggMenuMerge, we still need patches).
WARNING: it's no more possible to drag bookmarks in the toolbar,
if you depend on that feature please wait the weekend to update cvs.
* lib/egg/egg-markup.c:
* lib/egg/egg-markup.h:
Remove, not used.
* lib/widgets/Makefile.am:
* lib/widgets/ephy-editable-toolbar.c:
* lib/widgets/ephy-editable-toolbar.h:
* lib/widgets/ephy-toolbars-group.c:
* lib/widgets/ephy-toolbars-group.h:
Remove.
* src/prefs-dialog.c: (prefs_dialog_show_help),
(prefs_dialog_response_cb):
Fix a warning.
* src/toolbar.c: (toolbar_get_type), (toolbar_get_action_name),
(toolbar_get_action), (toolbar_class_init), (toolbar_init):
* src/toolbar.h:
* src/window-commands.c: (window_cmd_edit_toolbar):
Update to use the egg api.
Diffstat (limited to 'lib/egg/egg-action.c')
| -rw-r--r-- | lib/egg/egg-action.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/egg/egg-action.c b/lib/egg/egg-action.c index 6d1889e65..8cb099048 100644 --- a/lib/egg/egg-action.c +++ b/lib/egg/egg-action.c @@ -1,9 +1,7 @@ #include "egg-action.h" #include "eggtoolbutton.h" +#include "eggintl.h" -#ifndef _ -# define _(s) (s) -#endif /* some code for making arbitrary GtkButtons that act like toolbar * buttons */ @@ -38,7 +36,7 @@ static const gchar *accel_path_key = "EggAction::accel_path"; GType egg_action_get_type (void) { - static GType type = 0; + static GtkType type = 0; if (!type) { @@ -560,14 +558,11 @@ disconnect_proxy (EggAction *action, GtkWidget *proxy) G_CALLBACK (egg_action_sync_stock_id), proxy); /* menu item specific synchronisers ... */ - if (GTK_IS_MENU_ITEM (proxy)) - { - g_signal_handlers_disconnect_by_func (action, - G_CALLBACK (egg_action_sync_label), - proxy); + g_signal_handlers_disconnect_by_func (action, + G_CALLBACK (egg_action_sync_label), + proxy); - gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL); - } + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL); /* toolbar button specific synchronisers ... */ g_signal_handlers_disconnect_by_func (action, |