callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move icon theme path setup from main() to EShell.

Browse Source 
So Anjal picks it up.
This commit is contained in:
Matthew Barnes
2009-12-14 09:26:03 -05:00
parent 21f0613099
commit baea9882fc
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/Makefile.am
View File

@ -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)"\" \

6
shell/e-shell.c
View File

@ -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 (

4
shell/main.c
View File

@ -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)