diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-10-20 21:12:57 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-10-20 21:12:57 +0800 |
| commit | 501c4357042c915188dc900849e2c595ad4edf8a (patch) | |
| tree | 4e4f9c655d5a677242d20b2b139a3b7679b6a15c | |
| parent | 519f01f0b3d13bc1e6f0c02ba1a9b25983921aaa (diff) | |
| download | gsoc2013-epiphany-501c4357042c915188dc900849e2c595ad4edf8a.tar gsoc2013-epiphany-501c4357042c915188dc900849e2c595ad4edf8a.tar.gz gsoc2013-epiphany-501c4357042c915188dc900849e2c595ad4edf8a.tar.bz2 gsoc2013-epiphany-501c4357042c915188dc900849e2c595ad4edf8a.tar.lz gsoc2013-epiphany-501c4357042c915188dc900849e2c595ad4edf8a.tar.xz gsoc2013-epiphany-501c4357042c915188dc900849e2c595ad4edf8a.tar.zst gsoc2013-epiphany-501c4357042c915188dc900849e2c595ad4edf8a.zip | |
Remove fullscreen and leave-fullscreen stock icons; they're available in
2005-10-20 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
* lib/ephy-stock-icons.h:
* src/ephy-fullscreen-popup.c: (ephy_fullscreen_popup_constructor):
* src/ephy-toolbar.c: (ephy_toolbar_constructor):
* src/ephy-window.c:
Remove fullscreen and leave-fullscreen stock icons; they're available
in gtk+ since 2.8.
| -rw-r--r-- | lib/ephy-stock-icons.c | 2 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.h | 2 | ||||
| -rw-r--r-- | src/ephy-fullscreen-popup.c | 3 | ||||
| -rwxr-xr-x | src/ephy-toolbar.c | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index ba51b0a8c..961dd50b9 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -40,7 +40,6 @@ ephy_stock_icons_init (void) static const char *icon_theme_items[] = { STOCK_NEW_TAB, - STOCK_FULLSCREEN, STOCK_VIEW_SOURCE, STOCK_SEND_MAIL, STOCK_ADD_BOOKMARK, @@ -48,7 +47,6 @@ ephy_stock_icons_init (void) STOCK_LOCK_INSECURE, STOCK_LOCK_SECURE, STOCK_LOCK_BROKEN, - STOCK_LEAVE_FULLSCREEN }; static const GtkStockItem items[] = diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 4ff7d1862..9fcdd9911 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -33,7 +33,6 @@ G_BEGIN_DECLS #define EPHY_STOCK_DOWNLOAD "epiphany-download" #define STOCK_NEW_TAB "stock_new-tab" -#define STOCK_FULLSCREEN "stock_fullscreen" #define STOCK_VIEW_SOURCE "stock_view-html-source" #define STOCK_SEND_MAIL "stock_mail-send" #define STOCK_ADD_BOOKMARK "stock_add-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_LEAVE_FULLSCREEN "stock_leave-fullscreen" void ephy_stock_icons_init (void); diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c index f0f8187c4..aa3608d1c 100644 --- a/src/ephy-fullscreen-popup.c +++ b/src/ephy-fullscreen-popup.c @@ -23,7 +23,6 @@ #include "ephy-fullscreen-popup.h" #include "ephy-spinner.h" -#include "ephy-stock-icons.h" #include "ephy-debug.h" #include <glib/gi18n.h> @@ -276,7 +275,7 @@ ephy_fullscreen_popup_constructor (GType type, /* exit button */ priv->button = gtk_button_new_with_label (_("Leave Fullscreen")); - icon = gtk_image_new_from_stock (STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON); + icon = gtk_image_new_from_stock (GTK_STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (priv->button), icon); /* don't show the image! see bug #307818 */ g_signal_connect (priv->button, "clicked", diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index 0d2ef6bbc..3b40c0b9c 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -570,7 +570,7 @@ ephy_toolbar_constructor (GType type, priv->sep_item = gtk_separator_tool_item_new (); gtk_toolbar_insert (gtoolbar, priv->sep_item, -1); - priv->exit_button = gtk_tool_button_new_from_stock (STOCK_LEAVE_FULLSCREEN); + priv->exit_button = gtk_tool_button_new_from_stock (GTK_STOCK_LEAVE_FULLSCREEN); gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->exit_button), _("Leave Fullscreen")); gtk_tool_item_set_is_important (priv->exit_button, TRUE); g_signal_connect (priv->exit_button, "clicked", diff --git a/src/ephy-window.c b/src/ephy-window.c index ceaaa8719..553928d42 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -294,7 +294,7 @@ static const GtkToggleActionEntry ephy_menu_toggle_entries [] = { "ViewStatusbar", NULL, N_("St_atusbar"), NULL, N_("Show or hide statusbar"), G_CALLBACK (ephy_window_view_statusbar_cb), TRUE }, - { "ViewFullscreen", STOCK_FULLSCREEN, N_("_Fullscreen"), "F11", + { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11", N_("Browse at full screen"), G_CALLBACK (window_cmd_view_fullscreen), FALSE }, { "ViewPopupWindows", EPHY_STOCK_POPUPS, N_("Popup _Windows"), NULL, |