[maemo-commits] [maemo-commits] r10126 - in projects/haf/trunk/hildon-desktop: . libhildonwm

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-21 15:28:02 +0200 (Wed, 21 Feb 2007)
New Revision: 10126

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
   projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.c
   projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.h
Log:

2007-02-21  Johan Bilien  <johan.bilien at nokia.com>

	* libhildonwm/hd-wm.c: Fixed the leak of DBusError
	* libhildonwm/osso-manager.[ch]: removed unused functions.
	Thanks Kimmo Hamalainen for the reports



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-21 13:04:13 UTC (rev 10125)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-21 13:28:02 UTC (rev 10126)
@@ -1,5 +1,11 @@
 2007-02-21  Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildonwm/hd-wm.c: Fixed the leak of DBusError
+	* libhildonwm/osso-manager.[ch]: removed unused functions.
+	Thanks Kimmo Hamalainen for the reports
+
+2007-02-21  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildonwm/hd-wm.c: Initialize DBus error
 
 2007-02-21  Lucas Rocha  <lucas.rocha at nokia.com>

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-02-21 13:04:13 UTC (rev 10125)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-02-21 13:28:02 UTC (rev 10126)
@@ -404,10 +404,10 @@
     if (dbus_error_is_set (&error))
     {
       g_warning ("Error getting message args: %s\n", error.message);
+      dbus_error_free (&error);
       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
-
     g_return_val_if_fail (service_name, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 
     g_debug ("Checking if service: '%s' is watchable", service_name);
@@ -473,6 +473,7 @@
     {
 	g_warning ("Error getting message args: %s\n",
 		 err.message);
+        dbus_error_free (&err);
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.c	2007-02-21 13:04:13 UTC (rev 10125)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.c	2007-02-21 13:28:02 UTC (rev 10126)
@@ -159,45 +159,3 @@
     g_array_append_val(man->methods,met);
 }
 
-
-/** Method to set the x window to be used by the osso manager */
-void osso_manager_set_window(osso_manager_t *man,Window win)
-{
-    g_assert(win);
-    man->window=win;
-}
-
-int is_service_running(const char *service)
-{
-    osso_manager_t *man;
-    DBusConnection *con;
-    DBusError error;
-    char buf[DBUS_BUF_SIZE];
-    int n;
-
-    g_snprintf(buf,sizeof(buf),"%s%s",SERVICE_PREFIX,service);
-
-    man = osso_manager_singleton_get_instance();
-    if(man == NULL)
-    {
-        return -1;
-    }
-    
-    con = dbus_bus_get (DBUS_BUS_SESSION, &error);
-    if (dbus_error_is_set(&error)) goto error;
-
-    dbus_error_init(&error);
-    if (dbus_error_is_set(&error)) goto error;
-
-    n = dbus_bus_name_has_owner(con,buf,&error);
-    
-    return n;
-
-error:
-    g_warning ("Error detecting if %s is running: %s\n",
-               service,
-               error.message);
-    dbus_error_free(&error);
-    return -1;
-
-}

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.h
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.h	2007-02-21 13:04:13 UTC (rev 10125)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/osso-manager.h	2007-02-21 13:28:02 UTC (rev 10126)
@@ -111,14 +111,6 @@
                             gpointer data);
 
 
-/** Method to set the x window to be used by the osso manager */
-void osso_manager_set_window(osso_manager_t *man,Window win);
-
-
-
-/** Check if a service given is connected to D-BUS*/
-int is_service_running(const char *service);
-
 /** Getter for the osso context */
 
 G_END_DECLS