diff options
author | Michael Terry <mike@mterry.name> | 2004-04-19 23:17:54 +0800 |
---|---|---|
committer | Rodney Dawes <dobey@src.gnome.org> | 2004-04-19 23:17:54 +0800 |
commit | 9b8a6860948ad7cd5d1c6a24360e4b59fc120fb2 (patch) | |
tree | 526569cf0da5f2d8ef68dc60cfc919e1c931bfea /shell/e-shell-settings-dialog.c | |
parent | 1ace8a21329554efffa1d1185befee021cedd1a7 (diff) | |
download | gsoc2013-evolution-9b8a6860948ad7cd5d1c6a24360e4b59fc120fb2.tar.gz gsoc2013-evolution-9b8a6860948ad7cd5d1c6a24360e4b59fc120fb2.tar.zst gsoc2013-evolution-9b8a6860948ad7cd5d1c6a24360e4b59fc120fb2.zip |
Change component icons to use the icon theme names for icons Remove
2004-04-19 Michael Terry <mike@mterry.name>
* GNOME_Evolution_Test.server.in.in: Change component icons to use the
icon theme names for icons
* Makefile.am: Remove e-icon-factory.[ch]
* e-component-registry.c: Use the icon theme for component icons
* e-icon-factory.[ch]: Removed these files
* e-shell-importer.c:
* e-shell-settings-dialog.c:
* e-shell-startup-wizard.c:
* e-shell-window-commands.c:
* e-user-creatable-items-handler.c:
* evolution-shell-component-utils.[ch]:
* main.c:
* glade/evolution-startup-wizard.glade:
* importer/import.glade: Use the icon theme via EIconFactory for all
of the icons in the shell, and the window icons
svn path=/trunk/; revision=25512
Diffstat (limited to 'shell/e-shell-settings-dialog.c')
-rw-r--r-- | shell/e-shell-settings-dialog.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index c96049e10d..a34b7c4843 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -28,7 +28,7 @@ #include "e-shell-settings-dialog.h" #include "e-corba-config-page.h" - +#include <e-util/e-icon-factory.h> #include "e-util/e-lang-utils.h" #include <gal/util/e-util.h> @@ -204,11 +204,7 @@ load_pages (EShellSettingsDialog *dialog) if (g_path_is_absolute (icon_path)) { icon = gdk_pixbuf_new_from_file (icon_path, NULL); } else { - char *real_icon_path; - - real_icon_path = g_build_filename (EVOLUTION_IMAGES, icon_path, NULL); - icon = gdk_pixbuf_new_from_file (real_icon_path, NULL); - g_free (real_icon_path); + icon = e_icon_factory_get_icon (icon_path, 48); } } |