diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-07-02 17:09:26 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-07-02 17:09:26 +0800 |
| commit | 2507de9eae5d185af79d6425178ac571c4f48a75 (patch) | |
| tree | 85da5db9f8fbb183b7c5805df472d1a2f7e9a41a /src/window-commands.c | |
| parent | 7c78319ee7d559c4cedb6f9d9845e5496ccb9520 (diff) | |
| download | gsoc2013-epiphany-2507de9eae5d185af79d6425178ac571c4f48a75.tar gsoc2013-epiphany-2507de9eae5d185af79d6425178ac571c4f48a75.tar.gz gsoc2013-epiphany-2507de9eae5d185af79d6425178ac571c4f48a75.tar.bz2 gsoc2013-epiphany-2507de9eae5d185af79d6425178ac571c4f48a75.tar.lz gsoc2013-epiphany-2507de9eae5d185af79d6425178ac571c4f48a75.tar.xz gsoc2013-epiphany-2507de9eae5d185af79d6425178ac571c4f48a75.tar.zst gsoc2013-epiphany-2507de9eae5d185af79d6425178ac571c4f48a75.zip | |
Use the browser icon from gnome icon theme. Get rid of cache comparing
2003-07-02 Marco Pesenti Gritti <marco@it.gnome.org>
* data/art/Makefile.am:
* data/art/epiphany.png:
* data/epiphany.desktop.in:
* data/epiphany.schemas.in:
* data/glade/prefs-dialog.glade:
* embed/mozilla/mozilla-notifiers.cpp:
* lib/ephy-dialog.c: (ephy_dialog_set_size_group):
* lib/ephy-dialog.h:
* src/ephy-main.c: (main):
* src/prefs-dialog.c: (prefs_dialog_init),
(prefs_homepage_blank_button_clicked_cb), (fill_language_editor):
* src/window-commands.c: (window_cmd_help_about):
Use the browser icon from gnome icon theme.
Get rid of cache comparing prefs and rehash prefs pages to
make them more specific.
Diffstat (limited to 'src/window-commands.c')
| -rw-r--r-- | src/window-commands.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/src/window-commands.c b/src/window-commands.c index 10e154293..d1a93099f 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -46,6 +46,7 @@ #include <bonobo/bonobo-i18n.h> #include <libgnomeui/gnome-about.h> #include <libgnomeui/gnome-stock-icons.h> +#include <libgnomeui/gnome-icon-theme.h> #include <libgnome/gnome-program.h> #include <gtk/gtkeditable.h> @@ -723,8 +724,9 @@ window_cmd_help_about (EggAction *action, static GtkWidget *about = NULL; GtkWidget** ptr; GdkPixbuf *icon; - const char *icon_path; + char *icon_path; GdkPixbuf *logo; + GnomeIconTheme *icon_theme; static gchar *authors[] = { "Marco Pesenti Gritti <mpeseng@tin.it>", @@ -750,10 +752,21 @@ window_cmd_help_about (EggAction *action, return; } - icon_path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, - "epiphany.png", TRUE, NULL); - logo = gdk_pixbuf_new_from_file (icon_path, NULL); - g_return_if_fail (logo != NULL); + icon_theme = gnome_icon_theme_new (); + icon_path = gnome_icon_theme_lookup_icon (icon_theme, "web-browser", + -1, NULL, NULL); + g_object_unref (icon_theme); + + if (icon_path) + { + logo = gdk_pixbuf_new_from_file (icon_path, NULL); + g_free (icon_path); + } + else + { + logo = NULL; + g_warning ("Web browser gnome icon not found"); + } about = gnome_about_new( "Epiphany", VERSION, @@ -768,11 +781,11 @@ window_cmd_help_about (EggAction *action, gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); - - icon = gtk_widget_render_icon (about, - GNOME_STOCK_ABOUT, - GTK_ICON_SIZE_MENU, - NULL); + + icon = gtk_widget_render_icon (about, + GNOME_STOCK_ABOUT, + GTK_ICON_SIZE_MENU, + NULL); gtk_window_set_icon (GTK_WINDOW (about), icon); g_object_unref(icon); |