aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-10 03:40:18 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-10 03:40:18 +0800
commit237622044c96f0cfcba6d7fe21b908beb085b2e4 (patch)
tree06b0fb414cb8fb61020baa225106cbc267c2ce41 /src
parent8103e076a47bcf1f9b9cab2d3c64f0e1f319cccc (diff)
downloadgsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar.gz
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar.bz2
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar.lz
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar.xz
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.tar.zst
gsoc2013-epiphany-237622044c96f0cfcba6d7fe21b908beb085b2e4.zip
Rehash link context menu order to be hig compliant. Set a desktop icon.
2003-01-09 Marco Pesenti Gritti <marco@it.gnome.org> * data/art/Makefile.am: * data/epiphany.desktop.in: * data/ui/epiphany-ui.xml.in: * embed/ephy-embed-popup.c: (embed_popup_open_link_cmd): * src/ephy-main.c: (main): * src/window-commands.c: (window_cmd_set_charset): Rehash link context menu order to be hig compliant. Set a desktop icon.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-main.c8
-rw-r--r--src/window-commands.c1
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c
index becc1d2e5..46fac6e6a 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -116,6 +116,7 @@ main (int argc, char *argv[])
poptContext context;
GValue context_as_value = { 0 };
GnomeProgram *program;
+ char *file;
#ifdef ENABLE_NLS
/* Initialize the i18n stuff */
@@ -150,8 +151,11 @@ main (int argc, char *argv[])
ephy_shell_new ();
- gtk_window_set_default_icon_from_file
- (ephy_file ("epiphany.png"), NULL);
+ 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);
g_idle_add ((GSourceFunc) ephy_main_start, NULL);
diff --git a/src/window-commands.c b/src/window-commands.c
index 84fabab15..67400748d 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -797,7 +797,6 @@ window_cmd_set_charset (BonoboUIComponent *uic,
embed = ephy_window_get_active_embed (window);
g_return_if_fail (embed != NULL);
- g_print (data->encoding);
ephy_embed_set_charset (embed, data->encoding);
}