SF.net SVN: geany:[3095] trunk

[ntrel at users.sourceforge.net]

Revision: 3095
          http://geany.svn.sourceforge.net/geany/?rev=3095&view=rev
Author:   ntrel
Date:     2008-10-15 12:19:24 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
Fix showing desensitive widgets if no documents are open when a
plugin is first loaded.
Remove plugins_update_document_sensitive().

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/plugins.c
    trunk/src/plugins.h
    trunk/src/ui_utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-15 11:59:32 UTC (rev 3094)
+++ trunk/ChangeLog	2008-10-15 12:19:24 UTC (rev 3095)
@@ -3,6 +3,10 @@
  * src/interface.c, src/callbacks.c, src/callbacks.h, src/plugins.c,
    src/plugins.h, geany.glade:
    Show the tools menu separator if there are any items below it.
+ * src/plugins.c, src/plugins.h, src/ui_utils.c:
+   Fix showing desensitive widgets if no documents are open when a
+   plugin is first loaded.
+   Remove plugins_update_document_sensitive().
 
 
 2008-10-14  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2008-10-15 11:59:32 UTC (rev 3094)
+++ trunk/src/plugins.c	2008-10-15 12:19:24 UTC (rev 3095)
@@ -515,8 +515,7 @@
 
 	if (plugin->fields.flags & PLUGIN_IS_DOCUMENT_SENSITIVE)
 	{
-		gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) ? TRUE : FALSE;
-		gtk_widget_set_sensitive(plugin->fields.menu_item, enable);
+		ui_add_document_sensitive(plugin->fields.menu_item);
 	}
 
 	g_module_symbol(plugin->module, "plugin_callbacks", (void *) &callbacks);
@@ -911,20 +910,6 @@
 }
 
 
-void plugins_update_document_sensitive(gboolean enabled)
-{
-	GList *item;
-
-	for (item = active_plugin_list; item != NULL; item = g_list_next(item))
-	{
-		Plugin *plugin = item->data;
-
-		if (plugin->fields.flags & PLUGIN_IS_DOCUMENT_SENSITIVE)
-			gtk_widget_set_sensitive(plugin->fields.menu_item, enabled);
-	}
-}
-
-
 /* Plugin Manager */
 
 enum
@@ -943,7 +928,8 @@
 	GtkListStore *store;
 	GtkWidget *description_label;
 	GtkWidget *configure_button;
-} PluginManagerWidgets;
+}
+PluginManagerWidgets;
 
 static PluginManagerWidgets pm_widgets;
 

Modified: trunk/src/plugins.h
===================================================================
--- trunk/src/plugins.h	2008-10-15 11:59:32 UTC (rev 3094)
+++ trunk/src/plugins.h	2008-10-15 12:19:24 UTC (rev 3095)
@@ -36,8 +36,6 @@
 
 void plugins_load_prefs(GKeyFile *config);
 
-void plugins_update_document_sensitive(gboolean enabled);
-
 #endif
 
 #endif

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2008-10-15 11:59:32 UTC (rev 3094)
+++ trunk/src/ui_utils.c	2008-10-15 12:19:24 UTC (rev 3095)
@@ -645,12 +645,9 @@
 	for (i = 0; i < widgets.document_buttons->len; i++)
 	{
 		GtkWidget *widget = g_ptr_array_index(widgets.document_buttons, i);
+
 		gtk_widget_set_sensitive(widget, enable);
 	}
-
-#ifdef HAVE_PLUGINS
-	plugins_update_document_sensitive(enable);
-#endif
 }
 
 
@@ -666,6 +663,10 @@
  * @param widget The widget to add. */
 void ui_add_document_sensitive(GtkWidget *widget)
 {
+	gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) ? TRUE : FALSE;
+
+	gtk_widget_set_sensitive(widget, enable);
+
 	g_ptr_array_add(widgets.document_buttons, widget);
 	g_signal_connect(widget, "destroy", G_CALLBACK(on_doc_sensitive_widget_destroy), NULL);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.