gedit r6695 - in branches/win32: . gedit

[icq svn gnome org]

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

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

        * gedit/gedit-dirs.c:
        * gedit/gedit-dirs.h:
        * gedit/gedit-plugins-engine.c:
        * gedit/Makefile.am:                
        Use dir functions to manage the loaders and plugins.



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-plugins-engine.c

Modified: branches/win32/gedit/Makefile.am
==============================================================================
--- branches/win32/gedit/Makefile.am	(original)
+++ branches/win32/gedit/Makefile.am	Tue Dec 23 17:37:22 2008
@@ -16,9 +16,6 @@
 	-DLIBDIR=\""$(libdir)"\"					\
 	-DGEDIT_DATADIR=\""$(datadir)/gedit-2"\"			\
 	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
-	-DGEDIT_UIDIR=\""$(datadir)/gedit-2/ui/"\"			\
-	-DGEDIT_PLUGINDIR=\""$(libdir)/gedit-2/plugins"\"		\
-	-DGEDIT_LOADERDIR=\""$(libdir)/gedit-2/plugin-loaders"\"	\
 	-DGEDIT_ICONDIR=\""$(datadir)/gedit-2/icons"\"
 
 gedit_SOURCES = \

Modified: branches/win32/gedit/gedit-dirs.c
==============================================================================
--- branches/win32/gedit/gedit-dirs.c	(original)
+++ branches/win32/gedit/gedit-dirs.c	Tue Dec 23 17:37:22 2008
@@ -108,6 +108,38 @@
 }
 
 gchar *
+gedit_dirs_get_gedit_plugin_dir (void)
+{
+	gchar *lib_dir;
+	gchar *plugin_dir;
+	
+	lib_dir = gedit_dirs_get_gedit_lib_dir ();
+	
+	plugin_dir = g_build_filename (lib_dir,
+				       "plugins",
+				       NULL);
+	g_free (lib_dir);
+	
+	return plugin_dir;
+}
+
+gchar *
+gedit_dirs_get_gedit_loader_dir (void)
+{
+	gchar *lib_dir;
+	gchar *loader_dir;
+	
+	lib_dir = gedit_dirs_get_gedit_lib_dir ();
+	
+	loader_dir = g_build_filename (lib_dir,
+				       "plugin-loaders",
+				       NULL);
+	g_free (lib_dir);
+	
+	return loader_dir;
+}
+
+gchar *
 gedit_dirs_get_ui_file (const gchar *file)
 {
 	gchar *datadir;

Modified: branches/win32/gedit/gedit-dirs.h
==============================================================================
--- branches/win32/gedit/gedit-dirs.h	(original)
+++ branches/win32/gedit/gedit-dirs.h	Tue Dec 23 17:37:22 2008
@@ -36,6 +36,10 @@
 
 gchar		*gedit_dirs_get_gedit_lib_dir		(void);
 
+gchar		*gedit_dirs_get_gedit_plugin_dir	(void);
+
+gchar		*gedit_dirs_get_gedit_loader_dir	(void);
+
 gchar		*gedit_dirs_get_ui_file			(const gchar *file);
 
 G_END_DECLS

Modified: branches/win32/gedit/gedit-plugins-engine.c
==============================================================================
--- branches/win32/gedit/gedit-plugins-engine.c	(original)
+++ branches/win32/gedit/gedit-plugins-engine.c	Tue Dec 23 17:37:22 2008
@@ -226,13 +226,18 @@
 static void
 load_all_plugins (GeditPluginsEngine *engine)
 {
+	gchar *plugin_dir;
+
+	plugin_dir = gedit_dirs_get_gedit_plugin_dir ();
+
 	load_all_real (engine, 
 		       "plugins", 
 		       "GEDIT_PLUGINS_PATH", 
-		       GEDIT_PLUGINDIR,
+		       plugin_dir,
 		       PLUGIN_EXT,
 		       load_plugin_info,
 		       NULL);
+	g_free (plugin_dir);
 }
 
 static guint
@@ -482,15 +487,20 @@
 
 	if (loader_info == NULL)
 	{
+		gchar *loader_dir;
+		
+		loader_dir = gedit_dirs_get_gedit_loader_dir ();
+		
 		/* loader could not be found in the hash, try to find it by 
 		   scanning */
 		load_all_real (engine, 
 			       "plugin-loaders", 
 			       NULL, 
-			       GEDIT_LOADERDIR,
+			       loader_dir,
 			       LOADER_EXT,
 			       (LoadDirCallback)load_loader,
 			       NULL);
+		g_free (loader_dir);
 		
 		loader_info = (LoaderInfo *)g_hash_table_lookup (
 				engine->priv->loaders,