diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-01-31 06:22:20 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-01-31 06:22:20 +0800 |
| commit | 64f07f7d77b1846ff293558bbcb6190d1ac3cfa1 (patch) | |
| tree | 287c40481942dfcf66314a28fe23f60b976cbe0c | |
| parent | cbccb0edeaa90948433f559a16d8490c8ad3f97e (diff) | |
| download | gsoc2013-epiphany-64f07f7d77b1846ff293558bbcb6190d1ac3cfa1.tar gsoc2013-epiphany-64f07f7d77b1846ff293558bbcb6190d1ac3cfa1.tar.gz gsoc2013-epiphany-64f07f7d77b1846ff293558bbcb6190d1ac3cfa1.tar.bz2 gsoc2013-epiphany-64f07f7d77b1846ff293558bbcb6190d1ac3cfa1.tar.lz gsoc2013-epiphany-64f07f7d77b1846ff293558bbcb6190d1ac3cfa1.tar.xz gsoc2013-epiphany-64f07f7d77b1846ff293558bbcb6190d1ac3cfa1.tar.zst gsoc2013-epiphany-64f07f7d77b1846ff293558bbcb6190d1ac3cfa1.zip | |
Fix the build with -Werror.
2006-01-30 Christian Persch <chpe@cvs.gnome.org>
* lib/egg/egg-editable-toolbar.c:
(egg_editable_toolbar_set_ui_manager):
Fix the build with -Werror.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.c | 25 |
2 files changed, 21 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2006-01-30 Christian Persch <chpe@cvs.gnome.org> + + * lib/egg/egg-editable-toolbar.c: + (egg_editable_toolbar_set_ui_manager): + + Fix the build with -Werror. + 2006-01-30 Peter Harvey <peter.a.harvey@gmail.com> * data/ui/epiphany-ui.xml diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index d4c790297..c07466380 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -1232,20 +1232,23 @@ static void egg_editable_toolbar_set_ui_manager (EggEditableToolbar *etoolbar, GtkUIManager *manager) { - g_object_ref (manager); + static const GtkActionEntry actions[] = { + { "MoveToolItem", NULL, N_("_Move on Toolbar"), NULL, + N_("Move the selected item on the toolbar"), G_CALLBACK (move_item_cb) }, + { "RemoveToolItem", GTK_STOCK_REMOVE, N_("_Remove from Toolbar"), NULL, + N_("Remove the selected item from the toolbar"), G_CALLBACK (remove_item_cb) }, + { "RemoveToolbar", GTK_STOCK_REMOVE, N_("_Remove Toolbar"), NULL, + N_("Remove the selected toolbar"), G_CALLBACK (remove_toolbar_cb) }, + }; + g_object_ref (manager); + etoolbar->priv->actions = gtk_action_group_new ("ToolbarActions"); - GtkActionEntry actions[] = { - { "MoveToolItem", NULL, _("_Move on Toolbar"), NULL, - _("Move the selected item on the toolbar"), G_CALLBACK (move_item_cb) }, - { "RemoveToolItem", GTK_STOCK_REMOVE, _("_Remove from Toolbar"), NULL, - _("Remove the selected item from the toolbar"), G_CALLBACK (remove_item_cb) }, - { "RemoveToolbar", GTK_STOCK_REMOVE, _("_Remove Toolbar"), NULL, - _("Remove the selected toolbar"), G_CALLBACK (remove_toolbar_cb) }, - }; - gtk_action_group_add_actions (etoolbar->priv->actions, actions, 3, etoolbar); + gtk_action_group_set_translation_domain (etoolbar->priv->actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (etoolbar->priv->actions, actions, + G_N_ELEMENTS (actions), etoolbar); - gtk_ui_manager_insert_action_group (manager, etoolbar->priv->actions, 0); + gtk_ui_manager_insert_action_group (manager, etoolbar->priv->actions, -1); etoolbar->priv->manager = g_object_ref (manager); etoolbar->priv->popup_id = gtk_ui_manager_add_ui_from_string (manager, |