aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-main.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-07-02 17:09:26 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-07-02 17:09:26 +0800
commit2507de9eae5d185af79d6425178ac571c4f48a75 (patch)
tree85da5db9f8fbb183b7c5805df472d1a2f7e9a41a /src/ephy-main.c
parent7c78319ee7d559c4cedb6f9d9845e5496ccb9520 (diff)
downloadgsoc2013-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/ephy-main.c')
-rw-r--r--src/ephy-main.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 787140248..97121fe97 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -29,6 +29,7 @@
#include <libbonoboui.h>
#include <libgnome/gnome-program.h>
#include <libgnomeui/gnome-ui-init.h>
+#include <libgnomeui/gnome-icon-theme.h>
#include <gtk/gtkwindow.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <glade/glade-init.h>
@@ -145,17 +146,28 @@ main (int argc, char *argv[])
if (first_instance)
{
+ GnomeIconTheme *icon_theme;
+
gnome_vfs_init ();
glade_gnome_init ();
ephy_shell_new ();
- file = gnome_program_locate_file
- (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
- "epiphany.png", TRUE, NULL);
- gtk_window_set_default_icon_from_file (file, NULL);
- g_free (file);
+ icon_theme = gnome_icon_theme_new ();
+ file = gnome_icon_theme_lookup_icon (icon_theme, "web-browser",
+ -1, NULL, NULL);
+ g_object_unref (icon_theme);
+
+ if (file)
+ {
+ gtk_window_set_default_icon_from_file (file, NULL);
+ g_free (file);
+ }
+ else
+ {
+ g_warning ("Web browser gnome icon not found");
+ }
g_idle_add ((GSourceFunc) ephy_main_start, NULL);