From 85246cab6e9563ebb592e436bb1610fdf4258086 Mon Sep 17 00:00:00 2001 From: Luca Ferretti Date: Tue, 19 Dec 2006 17:03:22 +0000 Subject: Invert MoveToolItem and RemoveToolItem order, matchingh same feature for 2006-12-19 Luca Ferretti * data/ui/epiphany-ui.xml: Invert MoveToolItem and RemoveToolItem order, matchingh same feature for panel applets. * lib/egg/egg-editable-toolbar.c: (egg_editable_toolbar_set_ui_manager): * lib/ephy-stock-icons.c: (ephy_stock_icons_init): * lib/ephy-stock-icons.h: Remove STOCK_DRAG_MODE and STOCK_VIEW_SOURCE. --- lib/egg/egg-editable-toolbar.c | 3 +-- lib/ephy-stock-icons.c | 2 -- lib/ephy-stock-icons.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 4e74c4d25..19ca1d8c7 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -52,7 +52,6 @@ static void egg_editable_toolbar_init (EggEditableToolbar *etoolbar); #define MIN_TOOLBAR_HEIGHT 20 #define EGG_ITEM_NAME "egg-item-name" -#define STOCK_DRAG_MODE "stock_drag-mode" static const GtkTargetEntry dest_drag_types[] = { {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0}, @@ -1362,7 +1361,7 @@ egg_editable_toolbar_set_ui_manager (EggEditableToolbar *etoolbar, GtkUIManager *manager) { static const GtkActionEntry actions[] = { - { "MoveToolItem", STOCK_DRAG_MODE, N_("_Move on Toolbar"), NULL, + { "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) }, diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index 4ff277153..57faf72f1 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -41,7 +41,6 @@ ephy_stock_icons_init (void) { STOCK_NEW_TAB, STOCK_NEW_WINDOW, - STOCK_VIEW_SOURCE, STOCK_SEND_MAIL, STOCK_ADD_BOOKMARK, STOCK_BOOKMARK, @@ -49,7 +48,6 @@ ephy_stock_icons_init (void) STOCK_LOCK_INSECURE, STOCK_LOCK_SECURE, STOCK_LOCK_BROKEN, - STOCK_DRAG_MODE, }; static const GtkStockItem items[] = diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 220048ca8..030ad1dc9 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -33,7 +33,6 @@ G_BEGIN_DECLS #define STOCK_NEW_TAB "tab-new" #define STOCK_NEW_WINDOW "window-new" -#define STOCK_VIEW_SOURCE "text-html" #define STOCK_SEND_MAIL "mail-forward" #define STOCK_ADD_BOOKMARK "bookmark-new" #define STOCK_BOOKMARK "stock_bookmark" @@ -41,7 +40,6 @@ G_BEGIN_DECLS #define STOCK_LOCK_INSECURE "stock_lock-open" #define STOCK_LOCK_SECURE "stock_lock" #define STOCK_LOCK_BROKEN "stock_lock-broken" -#define STOCK_DRAG_MODE "stock_drag-mode" void ephy_stock_icons_init (void); -- cgit v1.2.3