diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-01-20 22:45:06 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-01-20 22:45:06 +0800 |
| commit | d299c83519b5e03d9d24f1ec80c25afcb793a73f (patch) | |
| tree | 9341bbe12deed3d2270420ca4c5534000d9a341e | |
| parent | d051f30561597cd4e389ec8a6cc2573d02ffa0a5 (diff) | |
| download | gsoc2013-epiphany-d299c83519b5e03d9d24f1ec80c25afcb793a73f.tar gsoc2013-epiphany-d299c83519b5e03d9d24f1ec80c25afcb793a73f.tar.gz gsoc2013-epiphany-d299c83519b5e03d9d24f1ec80c25afcb793a73f.tar.bz2 gsoc2013-epiphany-d299c83519b5e03d9d24f1ec80c25afcb793a73f.tar.lz gsoc2013-epiphany-d299c83519b5e03d9d24f1ec80c25afcb793a73f.tar.xz gsoc2013-epiphany-d299c83519b5e03d9d24f1ec80c25afcb793a73f.tar.zst gsoc2013-epiphany-d299c83519b5e03d9d24f1ec80c25afcb793a73f.zip | |
Use new leave-fullscreen icon from g-i-t. Fixes bug #164676.
2005-01-20 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
* 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):
Use new leave-fullscreen icon from g-i-t. Fixes bug #164676.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.c | 3 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.h | 1 | ||||
| -rw-r--r-- | src/ephy-fullscreen-popup.c | 3 | ||||
| -rwxr-xr-x | src/ephy-toolbar.c | 2 |
6 files changed, 19 insertions, 12 deletions
@@ -1,5 +1,15 @@ 2005-01-20 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + * 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): + + Use new leave-fullscreen icon from g-i-t. Fixes bug #164676. + +2005-01-20 Christian Persch <chpe@cvs.gnome.org> + * src/bookmarks/ephy-bookmarks-editor.c: (add_bookmarks_source): Add a translator comment. diff --git a/configure.ac b/configure.ac index f5d7d1e8c..db8e1106d 100644 --- a/configure.ac +++ b/configure.ac @@ -51,15 +51,8 @@ LIBXSLT_REQUIRED=1.1.7 LIBGNOMEVFS_REQUIRED=2.3.1 LIBGLADE_REQUIRED=2.3.1 LIBGNOMEUI_REQUIRED=2.6.0 - -AC_SUBST([GLIB_REQUIRED]) -AC_SUBST([PANGO_REQUIRED]) -AC_SUBST([GTK_REQUIRED]) -AC_SUBST([LIBXML_REQUIRED]) -AC_SUBST([LIBXSLT_REQUIRED]) -AC_SUBST([LIBGNOMEVFS_REQUIRED]) -AC_SUBST([LIBGLADE_REQUIRED]) -AC_SUBST([LIBGNOMEUI_REQUIRED]) +dnl rev this to 2.9.4 when released +GNOME_ICON_THEME_REQUIRED=2.9.3 AC_ENABLE_SHARED([yes]) AC_ENABLE_STATIC([no]) @@ -93,6 +86,7 @@ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED \ gnome-vfs-module-2.0 \ gconf-2.0 \ + gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED \ ]) AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS]) AC_SUBST([EPIPHANY_DEPENDENCY_LIBS]) diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index 8665aa1ec..ba51b0a8c 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -47,7 +47,8 @@ ephy_stock_icons_init (void) STOCK_PRINT_SETUP, STOCK_LOCK_INSECURE, STOCK_LOCK_SECURE, - STOCK_LOCK_BROKEN + 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 53ed4d5d4..4ff7d1862 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -41,6 +41,7 @@ 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 850f13908..bf6795cc0 100644 --- a/src/ephy-fullscreen-popup.c +++ b/src/ephy-fullscreen-popup.c @@ -23,6 +23,7 @@ #include "ephy-fullscreen-popup.h" #include "ephy-spinner.h" +#include "ephy-stock-icons.h" #include "ephy-debug.h" #include <glib/gi18n.h> @@ -275,7 +276,7 @@ ephy_fullscreen_popup_constructor (GType type, gtk_container_add (GTK_CONTAINER (priv->button), button_hbox); gtk_widget_show (button_hbox); - icon = gtk_image_new_from_stock (GTK_STOCK_QUIT, GTK_ICON_SIZE_BUTTON); + icon = gtk_image_new_from_stock (STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON); gtk_box_pack_start (GTK_BOX (button_hbox), icon, FALSE, FALSE, 0); gtk_widget_show (icon); diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index 729322109..8ece4642a 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -651,7 +651,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 (GTK_STOCK_QUIT); + priv->exit_button = gtk_tool_button_new_from_stock (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", |