diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-12-09 02:09:38 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-12-09 02:09:38 +0800 |
| commit | 814e26c5d3b13c31a95e5afa10a4731174477ee0 (patch) | |
| tree | 4da73a27d85137ab7f42a1c4b62a3a67962006c9 | |
| parent | 6ed75cd498aee194061daaa68e5bd4d5121e1cbb (diff) | |
| download | gsoc2013-epiphany-814e26c5d3b13c31a95e5afa10a4731174477ee0.tar gsoc2013-epiphany-814e26c5d3b13c31a95e5afa10a4731174477ee0.tar.gz gsoc2013-epiphany-814e26c5d3b13c31a95e5afa10a4731174477ee0.tar.bz2 gsoc2013-epiphany-814e26c5d3b13c31a95e5afa10a4731174477ee0.tar.lz gsoc2013-epiphany-814e26c5d3b13c31a95e5afa10a4731174477ee0.tar.xz gsoc2013-epiphany-814e26c5d3b13c31a95e5afa10a4731174477ee0.tar.zst gsoc2013-epiphany-814e26c5d3b13c31a95e5afa10a4731174477ee0.zip | |
Move code around.
2006-12-08 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
* src/ephy-main.c: (main):
Move code around.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.c | 7 | ||||
| -rw-r--r-- | src/ephy-main.c | 6 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2006-12-08 Christian Persch <chpe@cvs.gnome.org> + + * lib/ephy-stock-icons.c: (ephy_stock_icons_init): + * src/ephy-main.c: (main): + + Move code around. + 2006-12-08 Luca Ferretti <elle.uca@libero.it> * data/icons/16x16/actions/Makefile.am: diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index c303b7c74..4ff277153 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -93,4 +93,11 @@ ephy_stock_icons_init (void) gtk_icon_factory_add_default (factory); g_object_unref (factory); + + /* GtkIconTheme will then look in Ephy custom hicolor dir + * for icons as well as the standard search paths + */ + /* FIXME: multi-head! */ + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), + SHARE_DIR G_DIR_SEPARATOR_S "icons"); } diff --git a/src/ephy-main.c b/src/ephy-main.c index 42280b9ef..396942b8f 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -520,12 +520,6 @@ main (int argc, GNOME_PARAM_APP_DATADIR, DATADIR, NULL); - /* GtkIconTheme will then look in Ephy custom hicolor dir - * for icons as well as the standard search paths - */ - gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), - DATADIR "/epiphany/icons"); - /* libgnome keeps a reference to the global program, so drop * our reference here, to simplify cleanup on the many exit paths. */ |