aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-12-14 22:26:03 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-12-15 04:37:17 +0800
commitbaea9882fcc2c3056bf610b3df5077ddbfdee558 (patch)
tree4e45c9be2b19e158af8321f3eb22fcc375272f53 /shell
parent21f06130998918efef046b260cca6db150fdb42c (diff)
downloadgsoc2013-evolution-baea9882fcc2c3056bf610b3df5077ddbfdee558.tar
gsoc2013-evolution-baea9882fcc2c3056bf610b3df5077ddbfdee558.tar.gz
gsoc2013-evolution-baea9882fcc2c3056bf610b3df5077ddbfdee558.tar.bz2
gsoc2013-evolution-baea9882fcc2c3056bf610b3df5077ddbfdee558.tar.lz
gsoc2013-evolution-baea9882fcc2c3056bf610b3df5077ddbfdee558.tar.xz
gsoc2013-evolution-baea9882fcc2c3056bf610b3df5077ddbfdee558.tar.zst
gsoc2013-evolution-baea9882fcc2c3056bf610b3df5077ddbfdee558.zip
Move icon theme path setup from main() to EShell.
So Anjal picks it up.
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am2
-rw-r--r--shell/e-shell.c6
-rw-r--r--shell/main.c4
3 files changed, 7 insertions, 5 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index eacf65d18d..2dee1b2206 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -46,6 +46,7 @@ libeshell_la_CPPFLAGS = \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
+ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \
-DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \
-DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \
-DEVOLUTION_UIDIR=\""$(uidir)"\" \
@@ -111,7 +112,6 @@ evolution_CPPFLAGS = \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
- -DEVOLUTION_ICONDIR=\""$(icondir)"\" \
-DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \
-DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \
-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ebef1c084a..88638b0a5c 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1034,6 +1034,7 @@ shell_init (EShell *shell)
{
GHashTable *backends_by_name;
GHashTable *backends_by_scheme;
+ GtkIconTheme *icon_theme;
EggSMClient *sm_client;
shell->priv = E_SHELL_GET_PRIVATE (shell);
@@ -1054,6 +1055,11 @@ shell_init (EShell *shell)
e_shell_dbus_initialize (shell);
#endif
+ /* Add our icon directory to the theme's search path
+ * here instead of in main() so Anjal picks it up. */
+ icon_theme = gtk_icon_theme_get_default ();
+ gtk_icon_theme_append_search_path (icon_theme, EVOLUTION_ICONDIR);
+
shell_parse_debug_string (shell);
g_signal_connect (
diff --git a/shell/main.c b/shell/main.c
index 81a6a81540..2e8f07a7bc 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -451,7 +451,6 @@ gint
main (gint argc, gchar **argv)
{
EShell *shell;
- GtkIconTheme *icon_theme;
GConfClient *client;
#ifdef DEVELOPMENT
gboolean skip_warning_dialog;
@@ -553,9 +552,6 @@ main (gint argc, gchar **argv)
e_passwords_init ();
- icon_theme = gtk_icon_theme_get_default ();
- gtk_icon_theme_append_search_path (icon_theme, EVOLUTION_ICONDIR);
-
gtk_window_set_default_icon_name ("evolution");
if (setup_only)