From 035f56558cccf52c5c2052bb1f80a4b7519ed4c5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 11:55:50 -0800 Subject: Changing the type of the property and setting it with boxed --- src/libappindicator/app-indicator.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 908684f..2befb34 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -215,10 +215,10 @@ app_indicator_class_init (AppIndicatorClass *klass) g_object_class_install_property(object_class, PROP_MENU, - g_param_spec_string (PROP_MENU_S, + g_param_spec_boxed (PROP_MENU_S, "The object path of the menu on DBus.", "A method for getting the menu path as a string for DBus.", - NULL, + DBUS_TYPE_G_OBJECT_PATH, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, @@ -541,14 +541,14 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa break; case PROP_MENU: - if (G_VALUE_HOLDS_STRING(value)) { - if (priv->menuservice != NULL) { - g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, value); - } - } else { - WARN_BAD_TYPE(PROP_MENU_S, value); - } - break; + if (priv->menuservice != NULL) { + GValue strval = {0}; + g_value_init(&strval, G_TYPE_STRING); + g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strvalue); + g_value_set_boxed(value, g_value_get_string(&strvalue)); + g_value_unset(&strvalue); + } + break; case PROP_CONNECTED: g_value_set_boolean (value, priv->watcher_proxy != NULL ? TRUE : FALSE); -- cgit v1.2.3 From 28b0ba50227548758db097d0c6097b1a394e413f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 11:58:19 -0800 Subject: Ready to recieve the boxed type on the other side. --- src/libappindicator/app-indicator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 2befb34..19b4fd9 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -544,9 +544,9 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa if (priv->menuservice != NULL) { GValue strval = {0}; g_value_init(&strval, G_TYPE_STRING); - g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strvalue); - g_value_set_boxed(value, g_value_get_string(&strvalue)); - g_value_unset(&strvalue); + g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval); + g_value_set_boxed(value, g_value_get_string(&strval)); + g_value_unset(&strval); } break; -- cgit v1.2.3 From 370c87f0cfa8364d3efd66e229772e2db94b13dc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Feb 2010 08:43:35 -0600 Subject: Moving the registration of the object to when we want to connect everything, and making the path include the item ID to ensure it's unique. --- src/libappindicator/app-indicator.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 540620c..fb6e7dc 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -332,11 +332,7 @@ app_indicator_init (AppIndicator *self) } dbus_g_connection_ref(priv->connection); - dbus_g_connection_register_g_object(priv->connection, - DEFAULT_ITEM_PATH, - G_OBJECT(self)); - - self->priv = priv; + self->priv = priv; return; } @@ -584,6 +580,12 @@ check_connect (AppIndicator *self) if (priv->icon_name == NULL) return; if (priv->id == NULL) return; + gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->id); + dbus_g_connection_register_g_object(priv->connection, + path, + G_OBJECT(self)); + g_free(path); + GError * error = NULL; priv->watcher_proxy = dbus_g_proxy_new_for_name_owner(priv->connection, NOTIFICATION_WATCHER_DBUS_ADDR, -- cgit v1.2.3 From f5b69fe95891fd20bdce7100701799c3f997f1d7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Feb 2010 08:44:09 -0600 Subject: Making it so that you can't set an ID twice instead of just issuing a warning. --- src/libappindicator/app-indicator.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index fb6e7dc..ea823ff 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -441,16 +441,15 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu switch (prop_id) { case PROP_ID: - if (priv->id != NULL) { - g_warning ("Resetting ID value when I already had a value of: %s", priv->id); - g_free (priv->id); - priv->id = NULL; - } + if (priv->id != NULL) { + g_warning ("Resetting ID value when I already had a value of: %s", priv->id); + break; + } - priv->id = g_strdup (g_value_get_string (value)); + priv->id = g_strdup (g_value_get_string (value)); - check_connect (self); - break; + check_connect (self); + break; case PROP_CATEGORY: enum_val = g_enum_get_value_by_nick ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), -- cgit v1.2.3 From 907253f5ea802c1161bd718f8c9649c416e77bf2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Feb 2010 08:47:34 -0600 Subject: Making the menu path also include the ID --- src/libappindicator/app-indicator.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index ea823ff..b5512c5 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -115,9 +115,8 @@ enum { #define APP_INDICATOR_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), APP_INDICATOR_TYPE, AppIndicatorPrivate)) -/* Default Paths */ +/* Default Path */ #define DEFAULT_ITEM_PATH "/org/ayatana/NotificationItem" -#define DEFAULT_MENU_PATH "/org/ayatana/NotificationItem/Menu" /* More constants */ #define DEFAULT_FALLBACK_TIMER 100 /* in milliseconds */ @@ -1221,7 +1220,9 @@ setup_dbusmenu (AppIndicator *self) root); if (priv->menuservice == NULL) { - priv->menuservice = dbusmenu_server_new (DEFAULT_MENU_PATH); + gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->id); + priv->menuservice = dbusmenu_server_new (path); + g_free(path); } dbusmenu_server_set_root (priv->menuservice, root); -- cgit v1.2.3 From aafaa311dfe8548c8e2680ab98ee865ea75abc63 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Feb 2010 09:15:04 -0600 Subject: Creating a clean ID that doesn't take any illegal dbus characters and using that in the path. --- src/libappindicator/app-indicator.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index b5512c5..cfc6377 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -59,6 +59,7 @@ License version 3 and version 2.1 along with this program. If not, see struct _AppIndicatorPrivate { /* Properties */ gchar *id; + gchar *clean_id; AppIndicatorCategory category; AppIndicatorStatus status; gchar *icon_name; @@ -306,6 +307,7 @@ app_indicator_init (AppIndicator *self) AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self); priv->id = NULL; + priv->clean_id = NULL; priv->category = APP_INDICATOR_CATEGORY_OTHER; priv->status = APP_INDICATOR_STATUS_PASSIVE; priv->icon_name = NULL; @@ -408,6 +410,11 @@ app_indicator_finalize (GObject *object) priv->id = NULL; } + if (priv->clean_id != NULL) { + g_free(priv->clean_id); + priv->clean_id = NULL; + } + if (priv->icon_name != NULL) { g_free(priv->icon_name); priv->icon_name = NULL; @@ -578,11 +585,18 @@ check_connect (AppIndicator *self) if (priv->icon_name == NULL) return; if (priv->id == NULL) return; - gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->id); + priv->clean_id = g_strdup(priv->id); + gchar * cleaner; + for (cleaner = priv->clean_id; *cleaner != '\0'; cleaner++) { + if (!g_ascii_isalnum(*cleaner)) { + *cleaner = '_'; + } + } + + gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); dbus_g_connection_register_g_object(priv->connection, path, G_OBJECT(self)); - g_free(path); GError * error = NULL; priv->watcher_proxy = dbus_g_proxy_new_for_name_owner(priv->connection, @@ -595,11 +609,13 @@ check_connect (AppIndicator *self) it's not a warning anymore. */ g_error_free(error); start_fallback_timer(self, FALSE); + g_free(path); return; } g_signal_connect(G_OBJECT(priv->watcher_proxy), "destroy", G_CALLBACK(watcher_proxy_destroyed), self); - org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, DEFAULT_ITEM_PATH, register_service_cb, self); + org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self); + g_free(path); return; } @@ -1220,7 +1236,7 @@ setup_dbusmenu (AppIndicator *self) root); if (priv->menuservice == NULL) { - gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->id); + gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s/Menu", priv->clean_id); priv->menuservice = dbusmenu_server_new (path); g_free(path); } -- cgit v1.2.3 From cc9f01437a15cee6d180a4cd2f6c5a32a210e3b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Feb 2010 10:38:13 -0600 Subject: Moving the clean_id code to get set when we set the ID and checking for it when building the menu. --- src/libappindicator/app-indicator.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/libappindicator/app-indicator.c') diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index cfc6377..0ca68d4 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -454,6 +454,14 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu priv->id = g_strdup (g_value_get_string (value)); + priv->clean_id = g_strdup(priv->id); + gchar * cleaner; + for (cleaner = priv->clean_id; *cleaner != '\0'; cleaner++) { + if (!g_ascii_isalnum(*cleaner)) { + *cleaner = '_'; + } + } + check_connect (self); break; @@ -585,14 +593,6 @@ check_connect (AppIndicator *self) if (priv->icon_name == NULL) return; if (priv->id == NULL) return; - priv->clean_id = g_strdup(priv->id); - gchar * cleaner; - for (cleaner = priv->clean_id; *cleaner != '\0'; cleaner++) { - if (!g_ascii_isalnum(*cleaner)) { - *cleaner = '_'; - } - } - gchar * path = g_strdup_printf(DEFAULT_ITEM_PATH "/%s", priv->clean_id); dbus_g_connection_register_g_object(priv->connection, path, @@ -1262,6 +1262,7 @@ app_indicator_set_menu (AppIndicator *self, GtkMenu *menu) g_return_if_fail (IS_APP_INDICATOR (self)); g_return_if_fail (GTK_IS_MENU (menu)); + g_return_if_fail (self->priv->clean_id != NULL); priv = self->priv; -- cgit v1.2.3