diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-11-20 03:49:09 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-11-20 03:51:11 +0800 |
| commit | f11f1c477dfbdbe666ad5627ad44ac95bd7c816f (patch) | |
| tree | ddd0012dd490f35e634dfc74f682a6cd3e44c4a2 /shell | |
| parent | c83ebe7180f5e62c1d2d9df3b542cad52726187a (diff) | |
| download | gsoc2013-evolution-f11f1c477dfbdbe666ad5627ad44ac95bd7c816f.tar.gz gsoc2013-evolution-f11f1c477dfbdbe666ad5627ad44ac95bd7c816f.tar.zst gsoc2013-evolution-f11f1c477dfbdbe666ad5627ad44ac95bd7c816f.zip | |
Kill Evolution's icon cache once and for all.
GTK+ already does this. Eliminates e_icon_factory_init() and
e_icon_factory_shutdown().
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/main.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 13ab041122..541f941e58 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -111,6 +111,7 @@ evolution_CPPFLAGS = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ + -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \ -DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ diff --git a/shell/main.c b/shell/main.c index 2ef93d1247..ab82c2eded 100644 --- a/shell/main.c +++ b/shell/main.c @@ -55,7 +55,6 @@ #include "e-util/e-bconf-map.h" #include "e-util/e-dialog-utils.h" #include "e-util/e-error.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-plugin.h" #include "e-util/e-plugin-ui.h" #include "e-util/e-profile-event.h" @@ -475,6 +474,7 @@ extern void link_shutdown (void); gint main (gint argc, gchar **argv) { + GtkIconTheme *icon_theme; GConfClient *client; #ifdef DEVELOPMENT gboolean skip_warning_dialog; @@ -574,9 +574,11 @@ main (gint argc, gchar **argv) g_warning ("Could not set up debugging output file."); } - e_icon_factory_init (); 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) @@ -626,7 +628,6 @@ main (gint argc, gchar **argv) gtk_accel_map_save (e_get_accels_filename ()); - e_icon_factory_shutdown (); #ifdef G_OS_WIN32 link_shutdown (); #endif |