[Xfce4-commits] <parole:master> Fix up configure hint in the plugin module.

[Ali Abdallah]

Updating branch refs/heads/master
         to 61bcd0c9ae48e86089ce7c023448c5a9c0213d4b (commit)
       from 43734046b34b7da3241c2ef737fdd20b2ab3d10f (commit)

commit 61bcd0c9ae48e86089ce7c023448c5a9c0213d4b
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Tue Nov 24 14:00:59 2009 +0100

    Fix up configure hint in the plugin module.

 parole/parole-provider-plugin.c |    2 +-
 plugins/tray/tray-provider.c    |    9 ++-------
 src/parole-module.c             |   38 ++++++++++++++++++++++++++++++++------
 src/parole-plugins-manager.c    |    4 ++--
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/parole/parole-provider-plugin.c b/parole/parole-provider-plugin.c
index c6d12b0..5e28b7e 100644
--- a/parole/parole-provider-plugin.c
+++ b/parole/parole-provider-plugin.c
@@ -67,7 +67,7 @@ gboolean parole_provider_plugin_get_is_configurable (ParoleProviderPlugin *provi
     gboolean configurable = FALSE;
     
     g_return_val_if_fail (PAROLE_IS_PROVIDER_PLUGIN (provider), FALSE);
-    
+
     if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable )
     {
 	configurable = (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable) (provider);
diff --git a/plugins/tray/tray-provider.c b/plugins/tray/tray-provider.c
index 70e003e..e702a55 100644
--- a/plugins/tray/tray-provider.c
+++ b/plugins/tray/tray-provider.c
@@ -39,7 +39,7 @@
 #define RESOURCE_FILE 	"xfce4/parole/parole-plugins/tray.rc"
 
 static void   tray_provider_iface_init 	   (ParoleProviderPluginIface *iface);
-static void   tray_provider_finalize             (GObject 	              *object);
+static void   tray_provider_finalize       (GObject 	              *object);
 
 
 struct _TrayProviderClass
@@ -554,7 +554,6 @@ static void
 tray_provider_configure (ParoleProviderPlugin *provider, GtkWidget *parent)
 {
     TrayProvider *tray;
-    
     tray = TRAY_PROVIDER (provider);
     configure_plugin (tray, parent);
 }
@@ -562,11 +561,9 @@ tray_provider_configure (ParoleProviderPlugin *provider, GtkWidget *parent)
 static void
 tray_provider_iface_init (ParoleProviderPluginIface *iface)
 {
-    iface->get_is_configurable = tray_provider_is_configurable;
     iface->set_player = tray_provider_set_player;
-#ifdef HAVE_LIBNOTIFY
     iface->configure = tray_provider_configure;
-#endif
+    iface->get_is_configurable = tray_provider_is_configurable;
 }
 
 static void tray_provider_class_init (TrayProviderClass *klass)
@@ -587,8 +584,6 @@ static void tray_provider_finalize (GObject *object)
     
     tray = TRAY_PROVIDER (object);
     
-    g_debug ("Finalize tray provider");
-    
     if ( GTK_IS_WIDGET (tray->window) && g_signal_handler_is_connected (tray->window, tray->sig) )
 	g_signal_handler_disconnect (tray->window, tray->sig);
  
diff --git a/src/parole-module.c b/src/parole-module.c
index 1cc3a2d..e94cfe8 100644
--- a/src/parole-module.c
+++ b/src/parole-module.c
@@ -123,12 +123,6 @@ parole_module_unload (GTypeModule *gtype_module)
     
 }
 
-static gboolean
-parole_provider_module_get_is_active (ParoleProviderPlugin *plugin)
-{
-    return PAROLE_PROVIDER_MODULE (plugin)->active;
-}
-
 static void
 parole_provider_module_class_init (ParoleProviderModuleClass *klass)
 {
@@ -140,10 +134,42 @@ parole_provider_module_class_init (ParoleProviderModuleClass *klass)
     gtype_module_class->unload = parole_module_unload;
 }
 
+static gboolean
+parole_provider_module_get_is_active (ParoleProviderPlugin *plugin)
+{
+    return PAROLE_PROVIDER_MODULE (plugin)->active;
+}
+
+static gboolean
+parole_provider_module_get_is_configurable (ParoleProviderPlugin *plugin)
+{
+    ParoleProviderModule *module;
+    
+    module = PAROLE_PROVIDER_MODULE (plugin);
+    
+    if ( module->instance )
+	return parole_provider_plugin_get_is_configurable (module->instance);
+	
+    return FALSE;
+}
+
+static void
+parole_provider_module_configure (ParoleProviderPlugin *plugin, GtkWidget *parent)
+{
+    ParoleProviderModule *module;
+    
+    module = PAROLE_PROVIDER_MODULE (plugin);
+    
+    if ( module->instance )
+	parole_provider_plugin_configure (module->instance, parent);
+}
+
 static void     
 parole_provider_module_plugin_init (ParoleProviderPluginIface *iface)
 {
     iface->get_is_active = parole_provider_module_get_is_active;
+    iface->get_is_configurable = parole_provider_module_get_is_configurable;
+    iface->configure = parole_provider_module_configure;
 }
 
 static void
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 1d73bf1..a3d5f3e 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -163,7 +163,6 @@ parole_plugins_manager_get_selected_module_data (PrefData *pref, ParoleProviderM
 	*info = NULL;
         return;
     }
-
     gtk_tree_model_get (model,
                         &iter,
                         COL_MODULE, module,
@@ -174,8 +173,9 @@ parole_plugins_manager_get_selected_module_data (PrefData *pref, ParoleProviderM
 void parole_plugins_manager_show_configure (GtkButton *button, PrefData *pref)
 {
     ParoleProviderModule *module;
+    ParolePluginInfo *info;
     
-    parole_plugins_manager_get_selected_module_data (pref, &module, NULL);
+    parole_plugins_manager_get_selected_module_data (pref, &module, &info);
     
     if ( G_UNLIKELY (!module) )
 	return;