gedit r6697 - in branches/win32: . gedit

[icq svn gnome org]

Author: icq
Date: Tue Dec 23 17:56:26 2008
New Revision: 6697
URL: http://svn.gnome.org/viewvc/gedit?rev=6697&view=rev

Log:
2008-12-23  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gedit/gedit.c:
        * gedit/Makefile.am:
        Use dir functions to manage the icons path.



Modified:
   branches/win32/ChangeLog
   branches/win32/gedit/Makefile.am
   branches/win32/gedit/gedit.c

Modified: branches/win32/gedit/Makefile.am
==============================================================================
--- branches/win32/gedit/Makefile.am	(original)
+++ branches/win32/gedit/Makefile.am	Tue Dec 23 17:56:26 2008
@@ -14,8 +14,7 @@
 	$(DISABLE_DEPRECATED_CFLAGS)					\
 	-DDATADIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"					\
-	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
-	-DGEDIT_ICONDIR=\""$(datadir)/gedit-2/icons"\"
+	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	
 
 gedit_SOURCES = \
 	gedit.c

Modified: branches/win32/gedit/gedit.c
==============================================================================
--- branches/win32/gedit/gedit.c	(original)
+++ branches/win32/gedit/gedit.c	Tue Dec 23 17:56:26 2008
@@ -48,6 +48,7 @@
 #include "gedit-app.h"
 #include "gedit-commands.h"
 #include "gedit-debug.h"
+#include "gedit-dirs.h"
 #include "gedit-encodings.h"
 #include "gedit-metadata-manager.h"
 #include "gedit-plugins-engine.h"
@@ -472,6 +473,8 @@
 	GeditApp *app;
 	gboolean restored = FALSE;
 	GError *error = NULL;
+	gchar *data_dir;
+	gchar *icon_dir;
 
 	/* Init glib threads asap */
 	g_thread_init (NULL);
@@ -547,8 +550,15 @@
 
 	gedit_debug_message (DEBUG_APP, "Set icon");
 	
+	data_dir = gedit_dirs_get_gedit_data_dir ();
+	icon_dir = g_build_filename (data_dir,
+				     "icons",
+				     NULL);
+	g_free (data_dir);
+	
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-					   GEDIT_ICONDIR);
+					   icon_dir);
+	g_free (icon_dir);
 
 	/* Set the associated .desktop file */
 #if !defined PLATFORM_OSX && !defined G_OS_WIN32