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

Construct pathname under EVOLUTION_DATADIR at run-time because

Browse Source 
2008-01-24  Tor Lillqvist  <tml@novell.com>

	* e-icon-factory.c (e_icon_factory_init): Construct pathname under
	EVOLUTION_DATADIR at run-time because EVOLUTION_DATADIR is a
	function call on Windows.


svn path=/trunk/; revision=34885
This commit is contained in:
Tor Lillqvist
2008-01-24 21:06:23 +00:00
committed by Tor Lillqvist
parent 304bff669c
commit f52c571c51
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e-util/ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-24 Tor Lillqvist <tml@novell.com>
* e-icon-factory.c (e_icon_factory_init): Construct pathname under
EVOLUTION_DATADIR at run-time because EVOLUTION_DATADIR is a
function call on Windows.
2008-01-11 Milan Crha <mcrha@redhat.com>
** Fix for bug #488213

13
e-util/e-icon-factory.c
View File

@ -206,6 +206,8 @@ icon_theme_changed_cb (GtkIconTheme *icon_theme, gpointer user_data)
void
e_icon_factory_init (void)
{
gchar *path;
if (name_to_icon != NULL)
return;
@ -215,10 +217,13 @@ e_icon_factory_init (void)
(GDestroyNotify) icon_free);
icon_theme = gtk_icon_theme_get_default ();
gtk_icon_theme_append_search_path (icon_theme,
EVOLUTION_DATADIR G_DIR_SEPARATOR_S
"evolution" G_DIR_SEPARATOR_S
BASE_VERSION G_DIR_SEPARATOR_S "icons");
path = g_build_filename (EVOLUTION_DATADIR,
"evolution",
BASE_VERSION,
"icons",
NULL);
gtk_icon_theme_append_search_path (icon_theme, path);
g_free (path);
g_signal_connect (
icon_theme, "changed",
G_CALLBACK (icon_theme_changed_cb), NULL);