Fix applicationAdd signal to correctly send the path

diff --git a/registryd/desktop.c b/registryd/desktop.c
index c5e438d..e24357a 100644 (file)
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -49,11 +49,6 @@ static guint spi_desktop_signals[LAST_SIGNAL];
 /* Our parent Gtk object type */
 #define PARENT_TYPE SPI_ACCESSIBLE_TYPE
 
-typedef struct {
-       SpiDesktop *desktop;
-       const char *path;
-} Application;
-
 static gboolean exiting = FALSE;
 
 /* A pointer to our parent object class */
@@ -165,7 +160,7 @@ spi_desktop_dispose (GObject *object)
 
   while (desktop->applications)
     {
-      Application *app = desktop->applications->data;
+      SpiDesktopApplication *app = desktop->applications->data;
       g_assert (app != NULL);
       spi_desktop_remove_application (desktop, app->path);
     }
@@ -195,7 +190,7 @@ impl_desktop_get_child_at_index (DBusConnection *bus, DBusMessage *message, void
   SpiDesktop *desktop = SPI_REGISTRY(user_data)->desktop;
   DBusError error;
   dbus_int32_t index;
-  Application *app;
+  SpiDesktopApplication *app;
   const char *path;
   DBusMessage *reply;
 
@@ -223,7 +218,7 @@ impl_desktop_get_children (DBusConnection *bus, DBusMessage *message, void *user
   DBusError error;
   gint count;
   gint i;
-  Application *app;
+  SpiDesktopApplication *app;
   const char *path;
   DBusMessage *reply;
   DBusMessageIter iter, iter_array;
@@ -295,7 +290,7 @@ spi_desktop_new (void)
 }
 
 static void
-abnormal_application_termination (gpointer object, Application *app)
+abnormal_application_termination (gpointer object, SpiDesktopApplication *app)
 {
   g_return_if_fail (SPI_IS_DESKTOP (app->desktop));
 
@@ -307,13 +302,13 @@ void
 spi_desktop_add_application (SpiDesktop *desktop,
                             const char *application)
 {
-  Application       *app;
+  SpiDesktopApplication       *app;
 
   g_return_if_fail (SPI_IS_DESKTOP (desktop));
 
   spi_desktop_remove_application (desktop, application);
 
-  app = g_new (Application, 1);
+  app = g_new (SpiDesktopApplication, 1);
   app->desktop = desktop;
   app->path = application;
 
@@ -339,7 +334,7 @@ spi_desktop_remove_application (SpiDesktop *desktop,
   idx = 0;
   for (l = desktop->applications; l; l = l->next)
     {
-      Application *app = (Application *) l->data;
+      SpiDesktopApplication *app = (SpiDesktopApplication *) l->data;
 
       if (!strcmp(app->path, path))
         {
@@ -350,7 +345,7 @@ spi_desktop_remove_application (SpiDesktop *desktop,
 
   if (l)
     {
-      Application *app = (Application *) l->data;
+      SpiDesktopApplication *app = (SpiDesktopApplication *) l->data;
 
       desktop->applications = g_list_delete_link (desktop->applications, l);
 

diff --git a/registryd/desktop.h b/registryd/desktop.h
index 61a9142..a2ecb47 100644 (file)
--- a/registryd/desktop.h
+++ b/registryd/desktop.h
@@ -55,6 +55,11 @@ void        spi_desktop_add_application    (SpiDesktop *desktop,
 void        spi_desktop_remove_application (SpiDesktop *desktop,
                                            const char *app_path);
 
+typedef struct {
+       SpiDesktop *desktop;
+       const char *path;
+} SpiDesktopApplication;
+
 G_END_DECLS
 
 #endif /* SPI_DESKTOP_H_ */

diff --git a/registryd/registry.c b/registryd/registry.c
index 6068f52..a3eb411 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -84,9 +84,9 @@ desktop_add_application (SpiDesktop *desktop,
                         guint index, gpointer data)
 {
   SpiRegistry *registry = SPI_REGISTRY (data);
-  const char *name = g_list_nth_data(desktop->applications, index);
+  const SpiDesktopApplication *app = g_list_nth_data(desktop->applications, index);
   
-  emit(registry, "ApplicationAdd", DBUS_TYPE_UINT32, &index, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
+  emit(registry, "ApplicationAdd", DBUS_TYPE_UINT32, &index, DBUS_TYPE_STRING, &app->path, DBUS_TYPE_INVALID);
 }