[Xfce4-commits] <parole:master> Remove previous dummy-warning and add another

[Simon Steinbeiss]

Updating branch refs/heads/master
         to 661219642ad8b4c871017a232dea6a94a16f47a1 (commit)
       from e543e3a646ae4b7832a75c00d02fd569a7b57537 (commit)

commit 661219642ad8b4c871017a232dea6a94a16f47a1
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Sep 23 11:33:37 2013 +0200

    Remove previous dummy-warning and add another

 src/misc/parole-provider-plugin.c |    6 +++++-
 src/parole-plugins-manager.c      |   10 ++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/misc/parole-provider-plugin.c b/src/misc/parole-provider-plugin.c
index cea6cea..9162f9b 100644
--- a/src/misc/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -110,7 +110,11 @@ void parole_provider_plugin_configure (ParoleProviderPlugin *provider, GtkWidget
  **/
 void parole_provider_plugin_set_player (ParoleProviderPlugin *provider, ParoleProviderPlayer *player)
 {
-    g_return_if_fail (PAROLE_IS_PROVIDER_PLUGIN (provider));
+    if (!PAROLE_IS_PROVIDER_PLUGIN (provider))
+    {
+        g_warning ("Loading plugins failed, a warning dialog is in order.");
+        return;
+    }
     
     if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->set_player )
     {
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index de15205..0195455 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -269,14 +269,8 @@ parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
         {
             if ( active )
             {
-                if (g_type_module_use (G_TYPE_MODULE (module)))
-                    parole_provider_module_new_plugin (module);
-                else
-                {
-                    g_warning("Failed to load plugin.");
-                    parole_provider_module_free_plugin (module);
-                    g_type_module_unuse (G_TYPE_MODULE (module));
-                }
+                g_type_module_use (G_TYPE_MODULE (module));
+                parole_provider_module_new_plugin (module);
             }
             else
             {