gedit r6851 - in trunk: . gedit

[icq svn gnome org]

Author: icq
Date: Fri Jan 16 12:04:06 2009
New Revision: 6851
URL: http://svn.gnome.org/viewvc/gedit?rev=6851&view=rev

Log:
2009-01-16  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gedit/gedit-plugin-manager.c:
        * gedit/gedit-plugins-engine.c:
        * gedit/gedit-plugins-engine.h:
        Rescan plugins when creating the manager.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-plugin-manager.c
   trunk/gedit/gedit-plugins-engine.c
   trunk/gedit/gedit-plugins-engine.h

Modified: trunk/gedit/gedit-plugin-manager.c
==============================================================================
--- trunk/gedit/gedit-plugin-manager.c	(original)
+++ trunk/gedit/gedit-plugin-manager.c	Fri Jan 16 12:04:06 2009
@@ -792,6 +792,11 @@
 
 	pm->priv = GEDIT_PLUGIN_MANAGER_GET_PRIVATE (pm);
 
+	/*
+	 * Always we create the manager, firstly we rescan the plugins directory
+	 */
+	gedit_plugins_engine_rescan_plugins (gedit_plugins_engine_get_default ());
+
 	gtk_box_set_spacing (GTK_BOX (pm), 6);
 
 	label = gtk_label_new (NULL);

Modified: trunk/gedit/gedit-plugins-engine.c
==============================================================================
--- trunk/gedit/gedit-plugins-engine.c	(original)
+++ trunk/gedit/gedit-plugins-engine.c	Fri Jan 16 12:04:06 2009
@@ -148,9 +148,9 @@
 	 * drop this one (user plugins override system plugins) */
 	if (gedit_plugins_engine_get_plugin_info (engine, gedit_plugin_info_get_module_name (info)) != NULL)
 	{
-		g_warning ("Two or more plugins named '%s'. "
-			   "Only the first will be considered.\n",
-			   gedit_plugin_info_get_module_name (info));
+		gedit_debug_message (DEBUG_PLUGINS, "Two or more plugins named '%s'. "
+				     "Only the first will be considered.\n",
+				     gedit_plugin_info_get_module_name (info));
 
 		_gedit_plugin_info_unref (info);
 
@@ -839,3 +839,10 @@
 	g_slist_free (active_plugins);
 }
 
+void
+gedit_plugins_engine_rescan_plugins (GeditPluginsEngine *engine)
+{
+	gedit_debug (DEBUG_PLUGINS);
+	
+	load_all_plugins (engine);
+}

Modified: trunk/gedit/gedit-plugins-engine.h
==============================================================================
--- trunk/gedit/gedit-plugins-engine.h	(original)
+++ trunk/gedit/gedit-plugins-engine.h	Fri Jan 16 12:04:06 2009
@@ -100,6 +100,8 @@
 void		 gedit_plugins_engine_active_plugins_changed
 							(GeditPluginsEngine *engine);
 
+void		 gedit_plugins_engine_rescan_plugins	(GeditPluginsEngine *engine);
+
 G_END_DECLS
 
 #endif  /* __GEDIT_PLUGINS_ENGINE_H__ */