[maemo-commits] [maemo-commits] r17778 - in projects/haf/trunk/hildon-control-panel: . src

[From: subversion at stage.maemo.org]

Author: paradi
Date: 2009-03-23 17:12:50 +0200 (Mon, 23 Mar 2009)
New Revision: 17778

Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/src/hcp-app.c
Log:
* src/hcp-app.c:
  using libosso functions for executing and state saving
  hcp_app_can_save_state was returning the opposite



Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog	2009-03-23 12:37:19 UTC (rev 17777)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2009-03-23 15:12:50 UTC (rev 17778)
@@ -1,3 +1,9 @@
+2009-03-23 Peter Aradi <peter.aradi at maemo.org>
+	
+	* src/hcp-app.c:
+	using libosso functions for executing and state saving
+	hcp_app_can_save_state was returning the opposite
+
 2009-03-17 Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 
 	Release 2.2.6

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-app.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-03-23 12:37:19 UTC (rev 17777)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-03-23 15:12:50 UTC (rev 17778)
@@ -188,7 +188,8 @@
   g_return_val_if_fail (HCP_IS_APP (d->app), FALSE);
 
   priv = d->app->priv;
-  
+
+  /* required for checking eg. save_state availability and to be on the safe side */
   hcp_app_load (d->app);
 
   if (!priv->handle)
@@ -197,9 +198,14 @@
   priv->is_running = TRUE;
 
   /* Always use hcp->window as parent. If CP is launched without
-   * UI (run_applet RPC) the applet's dialog will be system modal */ 
-  priv->exec (program->osso, program->window, d->user_activated);
+   * UI (run_applet RPC) the applet's dialog will be system modal */
 
+  gchar* basename = g_path_get_basename (priv->plugin);
+  
+  osso_cp_plugin_execute (program->osso, basename,
+                          program->window, d->user_activated);
+  g_free (basename);
+
   priv->is_running = FALSE;
 
   program->execute = 0;
@@ -523,9 +529,10 @@
   g_return_if_fail (HCP_IS_APP (app));
 
   priv = app->priv;
+  gchar* basename = g_path_get_basename (priv->plugin);
+  osso_cp_plugin_save_state (program->osso, basename, NULL);
 
-  if (priv->save_state)
-    priv->save_state (program->osso, NULL /* What is expected here? -- Jobi */);
+  g_free (basename);
 }
 
 gboolean
@@ -551,7 +558,7 @@
 
   priv = app->priv;
 
-  return (priv->save_state == NULL);
+  return (priv->save_state != NULL);
 }
 
 gint