gedit r6698 - in branches/win32: . gedit

[icq svn gnome org]

Author: icq
Date: Tue Dec 23 18:30:07 2008
New Revision: 6698
URL: http://svn.gnome.org/viewvc/gedit?rev=6698&view=rev

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

        * gedit/gedit.c:
        * gedit/Makefile.am:
        * gedit/gedit-dirs.c:
        * gedit/gedit-dirs.h:
        Use dir func to manage the locale dir.



Modified:
   branches/win32/ChangeLog
   branches/win32/gedit/Makefile.am
   branches/win32/gedit/gedit-dirs.c
   branches/win32/gedit/gedit-dirs.h
   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 18:30:07 2008
@@ -13,8 +13,7 @@
 	$(WARN_CFLAGS)							\
 	$(DISABLE_DEPRECATED_CFLAGS)					\
 	-DDATADIR=\""$(datadir)"\"					\
-	-DLIBDIR=\""$(libdir)"\"					\
-	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	
+	-DLIBDIR=\""$(libdir)"\"					
 
 gedit_SOURCES = \
 	gedit.c

Modified: branches/win32/gedit/gedit-dirs.c
==============================================================================
--- branches/win32/gedit/gedit-dirs.c	(original)
+++ branches/win32/gedit/gedit-dirs.c	Tue Dec 23 18:30:07 2008
@@ -83,6 +83,31 @@
 }
 
 gchar *
+gedit_dirs_get_gedit_locale_dir (void)
+{
+	gchar *locale_dir;
+
+#ifndef G_OS_WIN32
+	locale_dir = g_build_filename (DATADIR,
+				       "locale",
+				       NULL);
+#else
+	gchar *win32_dir;
+	
+	win32_dir = g_win32_get_package_installation_directory_of_module (NULL);
+
+	locale_dir = g_build_filename (win32_dir,
+				       "share",
+				       "locale",
+				       NULL);
+	
+	g_free (win32_dir);
+#endif
+
+	return locale_dir;
+}
+
+gchar *
 gedit_dirs_get_gedit_lib_dir (void)
 {
 	gchar *lib_dir;

Modified: branches/win32/gedit/gedit-dirs.h
==============================================================================
--- branches/win32/gedit/gedit-dirs.h	(original)
+++ branches/win32/gedit/gedit-dirs.h	Tue Dec 23 18:30:07 2008
@@ -34,6 +34,8 @@
 
 gchar		*gedit_dirs_get_gedit_data_dir		(void);
 
+gchar		*gedit_dirs_get_gedit_locale_dir	(void);
+
 gchar		*gedit_dirs_get_gedit_lib_dir		(void);
 
 gchar		*gedit_dirs_get_gedit_plugin_dir	(void);

Modified: branches/win32/gedit/gedit.c
==============================================================================
--- branches/win32/gedit/gedit.c	(original)
+++ branches/win32/gedit/gedit.c	Tue Dec 23 18:30:07 2008
@@ -473,7 +473,7 @@
 	GeditApp *app;
 	gboolean restored = FALSE;
 	GError *error = NULL;
-	gchar *data_dir;
+	gchar *dir;
 	gchar *icon_dir;
 
 	/* Init glib threads asap */
@@ -485,7 +485,9 @@
 	
 	setlocale (LC_ALL, "");
 
-	bindtextdomain (GETTEXT_PACKAGE, GEDIT_LOCALEDIR);
+	dir = gedit_dirs_get_gedit_locale_dir ();
+	bindtextdomain (GETTEXT_PACKAGE, dir);
+	g_free (dir);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
@@ -550,11 +552,11 @@
 
 	gedit_debug_message (DEBUG_APP, "Set icon");
 	
-	data_dir = gedit_dirs_get_gedit_data_dir ();
-	icon_dir = g_build_filename (data_dir,
+	dir = gedit_dirs_get_gedit_data_dir ();
+	icon_dir = g_build_filename (dir,
 				     "icons",
 				     NULL);
-	g_free (data_dir);
+	g_free (dir);
 	
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
 					   icon_dir);