[maemo-commits] [maemo-commits] r9423 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-01-29 16:14:40 +0200 (Mon, 29 Jan 2007)
New Revision: 9423

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c
Log:

2007-01-29  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-plugin-loader-legacy.c: If set_conditional callback,
	set default value for the condition to FALSE



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-29 14:06:36 UTC (rev 9422)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-29 14:14:40 UTC (rev 9423)
@@ -1,3 +1,8 @@
+2007-01-29  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-plugin-loader-legacy.c: If set_conditional callback,
+	set default value for the condition to FALSE
+
 2007-01-29  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/statusbar-item.c:

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c	2007-01-29 14:06:36 UTC (rev 9422)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c	2007-01-29 14:14:40 UTC (rev 9423)
@@ -637,8 +637,6 @@
   gpointer          module_data;
   GtkWidget        *module_widget;
   GError           *local_error = NULL;
-  struct SBSetConditionalData
-                   *set_conditional_data;
   
   priv = HD_PLUGIN_LOADER_LEGACY_GET_PRIVATE (loader);
   
@@ -704,11 +702,21 @@
                             module_data);
   
   /* FIXME: This is leaked */
-  set_conditional_data = g_new0 (struct SBSetConditionalData, 1);
-  g_signal_connect (item, "notify::condition",
-                    G_CALLBACK (hd_plugin_loader_legacy_status_bar_set_conditional),
-                    set_conditional_data);
+  if (symbols.set_conditional)
+    {
+      struct SBSetConditionalData *set_conditional_data;
 
+      g_object_set (G_OBJECT (item), "condition", FALSE, NULL);
+
+      set_conditional_data = g_new0 (struct SBSetConditionalData, 1);
+      set_conditional_data->cb = (SBSetConditional)symbols.set_conditional;
+      set_conditional_data->module_data = module_data;
+
+      g_signal_connect (item, "notify::condition",
+                        G_CALLBACK (hd_plugin_loader_legacy_status_bar_set_conditional),
+                        set_conditional_data);
+    }
+
   return item;
 
 }