evolution r35217 - trunk/plugins/plugin-manager

[psankar svn gnome org]

Author: psankar
Date: Wed Mar 19 09:10:14 2008
New Revision: 35217
URL: http://svn.gnome.org/viewvc/evolution?rev=35217&view=rev

Log:
2008-03-19  Sankar P  <psankar novell com>

	** Fix for bug #496839

	* org-gnome-plugin-manager.eplug.xml:
	* plugin-manager.c: (org_gnome_plugin_manager_manage):
	- Do not show all plugins in plugin-manager. 
	Hide the core system plugins.




Modified:
   trunk/plugins/plugin-manager/ChangeLog
   trunk/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
   trunk/plugins/plugin-manager/plugin-manager.c

Modified: trunk/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
==============================================================================
--- trunk/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml	(original)
+++ trunk/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml	Wed Mar 19 09:10:14 2008
@@ -4,7 +4,8 @@
     type="shlib"
     id="org.gnome.evolution.plugin.manager"
     location="@PLUGINDIR@/liborg-gnome-plugin-manager SOEXT@"
-    _name="Plugin Manager">
+    _name="Plugin Manager"
+    system_plugin="yes">
     <_description>A plugin for managing which plugins are enabled or disabled.</_description>
     <author name="Michael Zucchi" email="notzed ximian com"/>
     <hook class="org.gnome.evolution.shell.bonobomenu:1.0">

Modified: trunk/plugins/plugin-manager/plugin-manager.c
==============================================================================
--- trunk/plugins/plugin-manager/plugin-manager.c	(original)
+++ trunk/plugins/plugin-manager/plugin-manager.c	Wed Mar 19 09:10:14 2008
@@ -288,9 +288,16 @@
 		GtkTreeIter iter;
 		GtkWidget *cfg_widget;
 
-		/* hide ourselves always */
-		if (!strcmp (ep->id, "org.gnome.evolution.plugin.manager"))
-			continue;
+		if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) { 
+			/* hide ourselves always */
+			if (ep->flags & E_PLUGIN_FLAGS_SYSTEM_PLUGIN)
+				continue;
+
+		} else {
+			/* Never ever show plugin-manager. User may disable it */
+			if (!strcmp (ep->id, "org.gnome.evolution.plugin.manager"))
+				continue;
+		}
 
 		cfg_widget = e_plugin_get_configure_widget (ep);
 		if (!cfg_widget) {
@@ -307,6 +314,7 @@
 				    COL_PLUGIN_DATA, ep,
 				    COL_PLUGIN_CFG_WIDGET, cfg_widget,
 				    -1);
+				    
 	}
 
 	/* setup the treeview */