From 3a33240e301a02fa6ee0aa0bd41780a0e3a28633 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 18 Jan 2013 19:48:04 +0100 Subject: Add IndicatorNg IndicatorNg is an indicator object that reads an indicator service file and watches the bus for a corresponding service to appear. It turns the menus and actions exported by the service into an indicator entry. --- libindicator/indicator-ng.c | 444 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 444 insertions(+) create mode 100644 libindicator/indicator-ng.c (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c new file mode 100644 index 0000000..d0d2177 --- /dev/null +++ b/libindicator/indicator-ng.c @@ -0,0 +1,444 @@ + +#include "indicator-ng.h" + +#include + +struct _IndicatorNg +{ + IndicatorObject parent; + + gchar *service_file; + gchar *name; + gchar *object_path; + gchar *profile; + gchar *header_action; + + guint name_watch_id; + + GActionGroup *actions; + GMenuModel *menu; + + GtkWidget *label; + GtkWidget *image; + GtkWidget *gtkmenu; + gchar *accessible_desc; +}; + +static void indicator_ng_initable_iface_init (GInitableIface *initable); +G_DEFINE_TYPE_WITH_CODE (IndicatorNg, indicator_ng, INDICATOR_OBJECT_TYPE, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, indicator_ng_initable_iface_init)) + +enum +{ + PROP_0, + PROP_SERVICE_FILE, + PROP_PROFILE, + N_PROPERTIES +}; + +static GParamSpec *properties[N_PROPERTIES]; + +static void +indicator_ng_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + IndicatorNg *self = INDICATOR_NG (object); + + switch (property_id) + { + case PROP_SERVICE_FILE: + g_value_set_string (value, self->service_file); + break; + + case PROP_PROFILE: + g_value_set_string (value, self->profile); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + +static void +indicator_ng_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + IndicatorNg *self = INDICATOR_NG (object); + + switch (property_id) + { + case PROP_SERVICE_FILE: /* construct-only */ + self->service_file = g_strdup (g_value_get_string (value)); + break; + + case PROP_PROFILE: /* construct-only */ + self->profile = g_strdup (g_value_get_string (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + +static void +indicator_ng_free_actions_and_menu (IndicatorNg *self) +{ + if (self->actions) + { + gtk_widget_insert_action_group (self->gtkmenu, self->name, self->actions); + g_signal_handlers_disconnect_by_data (self->actions, self); + g_clear_object (&self->actions); + } + + if (self->menu) + { + g_signal_handlers_disconnect_by_data (self->menu, self); + g_clear_object (&self->menu); + } +} + +static void +indicator_ng_dispose (GObject *object) +{ + IndicatorNg *self = INDICATOR_NG (object); + + if (self->name_watch_id) + { + g_bus_unwatch_name (self->name_watch_id); + self->name_watch_id = 0; + } + + indicator_ng_free_actions_and_menu (self); + + g_clear_object (&self->service_file); + g_clear_object (&self->label); + g_clear_object (&self->image); + g_clear_object (&self->gtkmenu); + + G_OBJECT_CLASS (indicator_ng_parent_class)->dispose (object); +} + +static void +indicator_ng_finalize (GObject *object) +{ + IndicatorNg *self = INDICATOR_NG (object); + + g_free (self->service_file); + g_free (self->name); + g_free (self->object_path); + g_free (self->accessible_desc); + g_free (self->header_action); + + G_OBJECT_CLASS (indicator_ng_parent_class)->finalize (object); +} + +static GtkLabel * +indicator_ng_get_label (IndicatorObject *io) +{ + IndicatorNg *self = INDICATOR_NG (io); + + gtk_widget_show (self->label); + + return GTK_LABEL (self->label); +} + +static GtkImage * +indicator_ng_get_image (IndicatorObject *io) +{ + IndicatorNg *self = INDICATOR_NG (io); + + gtk_widget_show (self->image); + + return GTK_IMAGE (self->image); +} + +static GtkMenu * +indicator_ng_get_menu (IndicatorObject *io) +{ + IndicatorNg *self = INDICATOR_NG (io); + + return GTK_MENU (self->gtkmenu); +} + +static const gchar * +indicator_ng_get_accessible_desc (IndicatorObject *io) +{ + IndicatorNg *self = INDICATOR_NG (io); + + return self->accessible_desc; +} + +static const gchar * +indicator_ng_get_name_hint (IndicatorObject *io) +{ + IndicatorNg *self = INDICATOR_NG (io); + + return self->name; +} + +static void +indicator_ng_set_accessible_desc (IndicatorNg *self, + const gchar *accessible_desc) +{ + GList *entries; + + g_free (self->accessible_desc); + + self->accessible_desc = g_strdup (accessible_desc); + + entries = indicator_object_get_entries (INDICATOR_OBJECT (self)); + g_return_if_fail (entries != NULL); + + g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entries->data); + + g_list_free (entries); +} + +static gboolean +gtk_image_set_from_gicon_string (GtkImage *img, + const gchar *str) +{ + GIcon *icon; + GError *error = NULL; + + icon = str ? g_icon_new_for_string (str, &error) : NULL; + if (icon) + { + gtk_image_set_from_gicon (img, icon, GTK_ICON_SIZE_LARGE_TOOLBAR); + g_object_unref (icon); + return TRUE; + } + else + { + if (error) + { + g_warning ("invalid icon string '%s': %s", str, error->message); + g_error_free (error); + } + return FALSE; + } +} + +static void +indicator_ng_update_entry (IndicatorNg *self) +{ + GVariant *state; + + g_return_if_fail (self->menu != NULL); + g_return_if_fail (self->actions != NULL); + + if (!self->header_action || + !g_action_group_has_action (self->actions, self->header_action)) + { + indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); + return; + } + + state = g_action_group_get_action_state (self->actions, self->header_action); + if (state && g_variant_is_of_type (state, G_VARIANT_TYPE ("(sssb)"))) + { + gchar *label; + gchar *iconstr; + gchar *accessible_desc; + gboolean visible; + + g_variant_get (state, "(sssb)", &label, &iconstr, &accessible_desc, &visible); + + gtk_label_set_label (GTK_LABEL (self->label), label); + if (!gtk_image_set_from_gicon_string (GTK_IMAGE (self->image), iconstr)) + gtk_widget_hide (self->image); + indicator_ng_set_accessible_desc (self, accessible_desc); + indicator_object_set_visible (INDICATOR_OBJECT (self), visible); + + g_free (label); + g_free (iconstr); + g_free (accessible_desc); + } + else + g_warning ("the action of the indicator menu item must have state with type (sssb)"); + + if (state) + g_variant_unref (state); +} + +static void +indicator_ng_menu_changed (GMenuModel *menu, + gint position, + gint removed, + gint added, + gpointer user_data) +{ + IndicatorNg *self = user_data; + + g_return_if_fail (position == 0); + g_return_if_fail (added < 2 && removed < 2 && added ^ removed); + + if (removed) + indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); + + if (added) + { + GMenuModel *popup; + gchar *action; + + g_clear_pointer (&self->header_action, g_free); + g_menu_model_get_item_attribute (self->menu, 0, G_MENU_ATTRIBUTE_ACTION, "s", &action); + if (action && g_str_has_prefix (action, "indicator.")) + self->header_action = g_strdup (action + 10); + + popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU); + if (popup) + { + gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->gtkmenu), popup, NULL, TRUE); + g_object_unref (popup); + } + + indicator_ng_update_entry (self); + + g_free (action); + } +} + +static void +indicator_ng_service_appeared (GDBusConnection *connection, + const gchar *name, + const gchar *name_owner, + gpointer user_data) +{ + IndicatorNg *self = user_data; + gchar *menu_object_path; + + g_assert (!self->actions); + g_assert (!self->menu); + + self->actions = G_ACTION_GROUP (g_dbus_action_group_get (connection, name_owner, self->object_path)); + gtk_widget_insert_action_group (self->gtkmenu, "indicator", self->actions); + g_signal_connect_swapped (self->actions, "action-added", G_CALLBACK (indicator_ng_update_entry), self); + g_signal_connect_swapped (self->actions, "action-removed", G_CALLBACK (indicator_ng_update_entry), self); + g_signal_connect_swapped (self->actions, "action-state-changed", G_CALLBACK (indicator_ng_update_entry), self); + + menu_object_path = g_strconcat (self->object_path, "/", self->profile, NULL); + self->menu = G_MENU_MODEL (g_dbus_menu_model_get (connection, name_owner, menu_object_path)); + g_signal_connect (self->menu, "items-changed", G_CALLBACK (indicator_ng_menu_changed), self); + if (g_menu_model_get_n_items (self->menu)) + indicator_ng_menu_changed (self->menu, 0, 0, 1, self); + + indicator_ng_update_entry (self); + + g_free (menu_object_path); +} + +static void +indicator_ng_service_vanished (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ + IndicatorNg *self = user_data; + + indicator_ng_free_actions_and_menu (self); + + indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); +} + +static gboolean +indicator_ng_initable_init (GInitable *initable, + GCancellable *cancellable, + GError **error) +{ + IndicatorNg *self = INDICATOR_NG (initable); + GKeyFile *keyfile; + gchar *bus_name = NULL; + + keyfile = g_key_file_new (); + if (!g_key_file_load_from_file (keyfile, + self->service_file, + G_KEY_FILE_NONE, + error)) + { + g_key_file_free (keyfile); + return FALSE; + } + + if ((self->name = g_key_file_get_string (keyfile, "Indicator Service", "Name", error)) && + (bus_name = g_key_file_get_string (keyfile, "Indicator Service", "BusName", error)) && + (self->object_path = g_key_file_get_string (keyfile, "Indicator Service", "ObjectPath", error))) + { + + self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, + bus_name, + G_BUS_NAME_WATCHER_FLAGS_NONE, + indicator_ng_service_appeared, + indicator_ng_service_vanished, + self, NULL); + } + + g_free (bus_name); + g_key_file_free (keyfile); + + return self->name_watch_id > 0; +} + +static void +indicator_ng_class_init (IndicatorNgClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + IndicatorObjectClass *io_class = INDICATOR_OBJECT_CLASS (class); + + object_class->get_property = indicator_ng_get_property; + object_class->set_property = indicator_ng_set_property; + object_class->dispose = indicator_ng_dispose; + object_class->finalize = indicator_ng_finalize; + + io_class->get_label = indicator_ng_get_label; + io_class->get_image = indicator_ng_get_image; + io_class->get_menu = indicator_ng_get_menu; + io_class->get_accessible_desc = indicator_ng_get_accessible_desc; + io_class->get_name_hint = indicator_ng_get_name_hint; + + properties[PROP_SERVICE_FILE] = g_param_spec_string ("service-file", + "Service file", + "Path of the service file", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); + + properties[PROP_PROFILE] = g_param_spec_string ("profile", + "Profile", + "Indicator profile", + "desktop", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties(object_class, N_PROPERTIES, properties); +} + +static void +indicator_ng_initable_iface_init (GInitableIface *initable) +{ + initable->init = indicator_ng_initable_init; +} + +static void +indicator_ng_init (IndicatorNg *self) +{ + self->label = g_object_ref_sink (gtk_label_new (NULL)); + self->image = g_object_ref_sink (gtk_image_new ()); + self->gtkmenu = g_object_ref_sink (gtk_menu_new ()); + + indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); +} + +IndicatorNg * +indicator_ng_new (const gchar *service_file, + GError **error) +{ + return g_initable_new (INDICATOR_TYPE_NG, NULL, error, + "service-file", service_file, + NULL); +} -- cgit v1.2.3 From af3ac653f86db8fefe9475a3354662636afd15e2 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 21 Jan 2013 16:38:11 +0100 Subject: indicator-ng: always set an accessible description to avoid imminent warning --- libindicator/indicator-ng.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index d0d2177..ea02847 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -431,6 +431,12 @@ indicator_ng_init (IndicatorNg *self) self->image = g_object_ref_sink (gtk_image_new ()); self->gtkmenu = g_object_ref_sink (gtk_menu_new ()); + /* work around IndicatorObject's warning that the accessible + * description is missing. We never set it on construction, but when + * the menu model has arrived on the bus. + */ + self->accessible_desc = g_strdup (""); + indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); } -- cgit v1.2.3 From 869d977e5add09a08ec6e1fcf1d77f8286adca53 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 21 Jan 2013 16:39:55 +0100 Subject: indicator-ng: fix crash (tried to free a string with g_object_unref) --- libindicator/indicator-ng.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index ea02847..10c362c 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -114,7 +114,6 @@ indicator_ng_dispose (GObject *object) indicator_ng_free_actions_and_menu (self); - g_clear_object (&self->service_file); g_clear_object (&self->label); g_clear_object (&self->image); g_clear_object (&self->gtkmenu); -- cgit v1.2.3 From 4b301ff893da66cb0a8f5e4c541efa7e70ee67a3 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 21 Jan 2013 17:04:02 +0100 Subject: indicator-ng: add indicator_ng_new_for_profile --- libindicator/indicator-ng.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 10c362c..32a9e0c 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -447,3 +447,14 @@ indicator_ng_new (const gchar *service_file, "service-file", service_file, NULL); } + +IndicatorNg * +indicator_ng_new_for_profile (const gchar *service_file, + const gchar *profile, + GError **error) +{ + return g_initable_new (INDICATOR_TYPE_NG, NULL, error, + "service-file", service_file, + "profile", profile, + NULL); +} -- cgit v1.2.3 From 1585adb6c7da6c021285bcca0cacbb1976c04d15 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 21 Jan 2013 17:09:55 +0100 Subject: indicator-ng: add getters --- libindicator/indicator-ng.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 32a9e0c..7b2b730 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -458,3 +458,19 @@ indicator_ng_new_for_profile (const gchar *service_file, "profile", profile, NULL); } + +const gchar * +indicator_ng_get_service_file (IndicatorNg *self) +{ + g_return_val_if_fail (INDICATOR_IS_NG (self), NULL); + + return self->service_file; +} + +const gchar * +indicator_ng_get_profile (IndicatorNg *self) +{ + g_return_val_if_fail (INDICATOR_IS_NG (self), NULL); + + return self->profile; +} -- cgit v1.2.3 From 67323d4aa99efc18ae2f379cd479d9b23e23dd94 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 22 Jan 2013 18:36:10 +0100 Subject: indicator-ng: properly unset action group when the service disappears --- libindicator/indicator-ng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 7b2b730..8de7112 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -89,7 +89,7 @@ indicator_ng_free_actions_and_menu (IndicatorNg *self) { if (self->actions) { - gtk_widget_insert_action_group (self->gtkmenu, self->name, self->actions); + gtk_widget_insert_action_group (self->gtkmenu, "indicator", NULL); g_signal_handlers_disconnect_by_data (self->actions, self); g_clear_object (&self->actions); } -- cgit v1.2.3 From ac0c8099e033c780066b968e09d955ac1552f862 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 23 Jan 2013 17:29:05 +0100 Subject: indicator-ng: auto start service if it's not running --- libindicator/indicator-ng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 8de7112..d241099 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -369,7 +369,7 @@ indicator_ng_initable_init (GInitable *initable, self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, bus_name, - G_BUS_NAME_WATCHER_FLAGS_NONE, + G_BUS_NAME_WATCHER_FLAGS_AUTO_START, indicator_ng_service_appeared, indicator_ng_service_vanished, self, NULL); -- cgit v1.2.3 From 739daae6ed0e8d0c95a131e5a2ea31fc2cfb4ec0 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 23 Jan 2013 17:30:05 +0100 Subject: indicator-ng: use base->get_entries to get the invisible ones, too --- libindicator/indicator-ng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index d241099..a77aa43 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -189,7 +189,7 @@ indicator_ng_set_accessible_desc (IndicatorNg *self, self->accessible_desc = g_strdup (accessible_desc); - entries = indicator_object_get_entries (INDICATOR_OBJECT (self)); + entries = INDICATOR_OBJECT_GET_CLASS (self)->get_entries (INDICATOR_OBJECT (self)); g_return_if_fail (entries != NULL); g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entries->data); -- cgit v1.2.3 From e07deff5a9e253d9e407e75ce2293e3cbb688d12 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 23 Jan 2013 17:55:08 +0100 Subject: indicator-ng: set name hint to the value of the service file's "Name" field --- libindicator/indicator-ng.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index a77aa43..975ae9f 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -38,6 +38,21 @@ enum static GParamSpec *properties[N_PROPERTIES]; +static IndicatorObjectEntry * +indicator_ng_get_entry (IndicatorNg *self) +{ + GList *entries; + IndicatorObjectEntry *entry; + + entries = INDICATOR_OBJECT_GET_CLASS (self)->get_entries (INDICATOR_OBJECT (self)); + g_return_val_if_fail (entries != NULL, NULL); + + entry = entries->data; + + g_list_free (entries); + return entry; +} + static void indicator_ng_get_property (GObject *object, guint property_id, @@ -183,18 +198,14 @@ static void indicator_ng_set_accessible_desc (IndicatorNg *self, const gchar *accessible_desc) { - GList *entries; + IndicatorObjectEntry *entry; - g_free (self->accessible_desc); + entry = indicator_ng_get_entry (self); + g_free (self->accessible_desc); self->accessible_desc = g_strdup (accessible_desc); - entries = INDICATOR_OBJECT_GET_CLASS (self)->get_entries (INDICATOR_OBJECT (self)); - g_return_if_fail (entries != NULL); - - g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entries->data); - - g_list_free (entries); + g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entry); } static gboolean @@ -366,6 +377,10 @@ indicator_ng_initable_init (GInitable *initable, (bus_name = g_key_file_get_string (keyfile, "Indicator Service", "BusName", error)) && (self->object_path = g_key_file_get_string (keyfile, "Indicator Service", "ObjectPath", error))) { + IndicatorObjectEntry *entry; + + entry = indicator_ng_get_entry (self); + entry->name_hint = self->name; self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, bus_name, -- cgit v1.2.3 From f3f4e1fc318c5ac200208c78e90a59926e929fba Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 24 Jan 2013 10:23:35 +0100 Subject: indicator-ng: use an IndicatorObjectEntry internally We needed the entry anyway (that's what indicator_ng_get_entry was for). --- libindicator/indicator-ng.c | 109 +++++++++++--------------------------------- 1 file changed, 26 insertions(+), 83 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 975ae9f..78cc80f 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -18,9 +18,7 @@ struct _IndicatorNg GActionGroup *actions; GMenuModel *menu; - GtkWidget *label; - GtkWidget *image; - GtkWidget *gtkmenu; + IndicatorObjectEntry entry; gchar *accessible_desc; }; @@ -38,21 +36,6 @@ enum static GParamSpec *properties[N_PROPERTIES]; -static IndicatorObjectEntry * -indicator_ng_get_entry (IndicatorNg *self) -{ - GList *entries; - IndicatorObjectEntry *entry; - - entries = INDICATOR_OBJECT_GET_CLASS (self)->get_entries (INDICATOR_OBJECT (self)); - g_return_val_if_fail (entries != NULL, NULL); - - entry = entries->data; - - g_list_free (entries); - return entry; -} - static void indicator_ng_get_property (GObject *object, guint property_id, @@ -104,7 +87,7 @@ indicator_ng_free_actions_and_menu (IndicatorNg *self) { if (self->actions) { - gtk_widget_insert_action_group (self->gtkmenu, "indicator", NULL); + gtk_widget_insert_action_group (GTK_WIDGET (self->entry.menu), "indicator", NULL); g_signal_handlers_disconnect_by_data (self->actions, self); g_clear_object (&self->actions); } @@ -129,9 +112,9 @@ indicator_ng_dispose (GObject *object) indicator_ng_free_actions_and_menu (self); - g_clear_object (&self->label); - g_clear_object (&self->image); - g_clear_object (&self->gtkmenu); + g_clear_object (&self->entry.label); + g_clear_object (&self->entry.image); + g_clear_object (&self->entry.menu); G_OBJECT_CLASS (indicator_ng_parent_class)->dispose (object); } @@ -150,62 +133,23 @@ indicator_ng_finalize (GObject *object) G_OBJECT_CLASS (indicator_ng_parent_class)->finalize (object); } -static GtkLabel * -indicator_ng_get_label (IndicatorObject *io) -{ - IndicatorNg *self = INDICATOR_NG (io); - - gtk_widget_show (self->label); - - return GTK_LABEL (self->label); -} - -static GtkImage * -indicator_ng_get_image (IndicatorObject *io) -{ - IndicatorNg *self = INDICATOR_NG (io); - - gtk_widget_show (self->image); - - return GTK_IMAGE (self->image); -} - -static GtkMenu * -indicator_ng_get_menu (IndicatorObject *io) +static GList * +indicator_ng_get_entries (IndicatorObject *io) { IndicatorNg *self = INDICATOR_NG (io); - return GTK_MENU (self->gtkmenu); -} - -static const gchar * -indicator_ng_get_accessible_desc (IndicatorObject *io) -{ - IndicatorNg *self = INDICATOR_NG (io); - - return self->accessible_desc; -} - -static const gchar * -indicator_ng_get_name_hint (IndicatorObject *io) -{ - IndicatorNg *self = INDICATOR_NG (io); - - return self->name; + return g_list_append (NULL, &self->entry); } static void indicator_ng_set_accessible_desc (IndicatorNg *self, const gchar *accessible_desc) { - IndicatorObjectEntry *entry; - - entry = indicator_ng_get_entry (self); - g_free (self->accessible_desc); self->accessible_desc = g_strdup (accessible_desc); - g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entry); + self->entry.accessible_desc = self->accessible_desc; + g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, &self->entry); } static gboolean @@ -255,12 +199,15 @@ indicator_ng_update_entry (IndicatorNg *self) gchar *iconstr; gchar *accessible_desc; gboolean visible; + gboolean has_icon; g_variant_get (state, "(sssb)", &label, &iconstr, &accessible_desc, &visible); - gtk_label_set_label (GTK_LABEL (self->label), label); - if (!gtk_image_set_from_gicon_string (GTK_IMAGE (self->image), iconstr)) - gtk_widget_hide (self->image); + gtk_label_set_label (GTK_LABEL (self->entry.label), label); + + has_icon = gtk_image_set_from_gicon_string (self->entry.image, iconstr); + gtk_widget_set_visible (GTK_WIDGET (self->entry.image), has_icon); + indicator_ng_set_accessible_desc (self, accessible_desc); indicator_object_set_visible (INDICATOR_OBJECT (self), visible); @@ -303,7 +250,7 @@ indicator_ng_menu_changed (GMenuModel *menu, popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU); if (popup) { - gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->gtkmenu), popup, NULL, TRUE); + gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->entry.menu), popup, NULL, TRUE); g_object_unref (popup); } @@ -326,7 +273,7 @@ indicator_ng_service_appeared (GDBusConnection *connection, g_assert (!self->menu); self->actions = G_ACTION_GROUP (g_dbus_action_group_get (connection, name_owner, self->object_path)); - gtk_widget_insert_action_group (self->gtkmenu, "indicator", self->actions); + gtk_widget_insert_action_group (GTK_WIDGET (self->entry.menu), "indicator", self->actions); g_signal_connect_swapped (self->actions, "action-added", G_CALLBACK (indicator_ng_update_entry), self); g_signal_connect_swapped (self->actions, "action-removed", G_CALLBACK (indicator_ng_update_entry), self); g_signal_connect_swapped (self->actions, "action-state-changed", G_CALLBACK (indicator_ng_update_entry), self); @@ -377,10 +324,7 @@ indicator_ng_initable_init (GInitable *initable, (bus_name = g_key_file_get_string (keyfile, "Indicator Service", "BusName", error)) && (self->object_path = g_key_file_get_string (keyfile, "Indicator Service", "ObjectPath", error))) { - IndicatorObjectEntry *entry; - - entry = indicator_ng_get_entry (self); - entry->name_hint = self->name; + self->entry.name_hint = self->name; self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, bus_name, @@ -407,11 +351,7 @@ indicator_ng_class_init (IndicatorNgClass *class) object_class->dispose = indicator_ng_dispose; object_class->finalize = indicator_ng_finalize; - io_class->get_label = indicator_ng_get_label; - io_class->get_image = indicator_ng_get_image; - io_class->get_menu = indicator_ng_get_menu; - io_class->get_accessible_desc = indicator_ng_get_accessible_desc; - io_class->get_name_hint = indicator_ng_get_name_hint; + io_class->get_entries = indicator_ng_get_entries; properties[PROP_SERVICE_FILE] = g_param_spec_string ("service-file", "Service file", @@ -441,15 +381,18 @@ indicator_ng_initable_iface_init (GInitableIface *initable) static void indicator_ng_init (IndicatorNg *self) { - self->label = g_object_ref_sink (gtk_label_new (NULL)); - self->image = g_object_ref_sink (gtk_image_new ()); - self->gtkmenu = g_object_ref_sink (gtk_menu_new ()); + self->entry.label = g_object_ref_sink (gtk_label_new (NULL)); + gtk_widget_show (GTK_WIDGET (self->entry.label)); + + self->entry.image = g_object_ref_sink (gtk_image_new ()); + self->entry.menu = g_object_ref_sink (gtk_menu_new ()); /* work around IndicatorObject's warning that the accessible * description is missing. We never set it on construction, but when * the menu model has arrived on the bus. */ self->accessible_desc = g_strdup (""); + self->entry.accessible_desc = self->accessible_desc; indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); } -- cgit v1.2.3 From 05535f5916cdcb3a23334b6cb7b323f5508257ef Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 24 Jan 2013 11:22:39 +0100 Subject: indicator-ng: show broken image when g_icon_for_string returns NULL --- libindicator/indicator-ng.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 78cc80f..be73eb3 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -152,28 +152,33 @@ indicator_ng_set_accessible_desc (IndicatorNg *self, g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, &self->entry); } -static gboolean -gtk_image_set_from_gicon_string (GtkImage *img, - const gchar *str) +static void +indicator_ng_set_icon_from_string (IndicatorNg *self, + const gchar *str) { GIcon *icon; GError *error = NULL; - icon = str ? g_icon_new_for_string (str, &error) : NULL; + if (str == NULL || *str == '\0') + { + gtk_image_clear (self->entry.image); + gtk_widget_hide (GTK_WIDGET (self->entry.image)); + return; + } + + gtk_widget_show (GTK_WIDGET (self->entry.image)); + + icon = g_icon_new_for_string (str, &error); if (icon) { - gtk_image_set_from_gicon (img, icon, GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_image_set_from_gicon (self->entry.image, icon, GTK_ICON_SIZE_LARGE_TOOLBAR); g_object_unref (icon); - return TRUE; } else { - if (error) - { - g_warning ("invalid icon string '%s': %s", str, error->message); - g_error_free (error); - } - return FALSE; + g_warning ("invalid icon string '%s': %s", str, error->message); + gtk_image_set_from_stock (self->entry.image, GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_LARGE_TOOLBAR); + g_error_free (error); } } @@ -199,15 +204,11 @@ indicator_ng_update_entry (IndicatorNg *self) gchar *iconstr; gchar *accessible_desc; gboolean visible; - gboolean has_icon; g_variant_get (state, "(sssb)", &label, &iconstr, &accessible_desc, &visible); gtk_label_set_label (GTK_LABEL (self->entry.label), label); - - has_icon = gtk_image_set_from_gicon_string (self->entry.image, iconstr); - gtk_widget_set_visible (GTK_WIDGET (self->entry.image), has_icon); - + indicator_ng_set_icon_from_string (self, iconstr); indicator_ng_set_accessible_desc (self, accessible_desc); indicator_object_set_visible (INDICATOR_OBJECT (self), visible); -- cgit v1.2.3 From 088b36be863ed966426754b1505009967254293c Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 24 Jan 2013 11:25:11 +0100 Subject: indicator-ng: save unnecessary allocations by using "&" in g_variant_get --- libindicator/indicator-ng.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index be73eb3..b7ea334 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -200,21 +200,17 @@ indicator_ng_update_entry (IndicatorNg *self) state = g_action_group_get_action_state (self->actions, self->header_action); if (state && g_variant_is_of_type (state, G_VARIANT_TYPE ("(sssb)"))) { - gchar *label; - gchar *iconstr; - gchar *accessible_desc; + const gchar *label; + const gchar *iconstr; + const gchar *accessible_desc; gboolean visible; - g_variant_get (state, "(sssb)", &label, &iconstr, &accessible_desc, &visible); + g_variant_get (state, "(&s&s&sb)", &label, &iconstr, &accessible_desc, &visible); gtk_label_set_label (GTK_LABEL (self->entry.label), label); indicator_ng_set_icon_from_string (self, iconstr); indicator_ng_set_accessible_desc (self, accessible_desc); indicator_object_set_visible (INDICATOR_OBJECT (self), visible); - - g_free (label); - g_free (iconstr); - g_free (accessible_desc); } else g_warning ("the action of the indicator menu item must have state with type (sssb)"); -- cgit v1.2.3 From db1caf23cdfb98ce99086eebe46660928b43f6e9 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 24 Jan 2013 11:29:24 +0100 Subject: indicator-ng: document error conditions in menu_changed --- libindicator/indicator-ng.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index b7ea334..82af030 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -228,6 +228,10 @@ indicator_ng_menu_changed (GMenuModel *menu, { IndicatorNg *self = user_data; + /* The menu may only contain one item (the indicator title menu). + * Thus, the position is always 0, and there is either exactly one + * item added or exactly one item removed. + */ g_return_if_fail (position == 0); g_return_if_fail (added < 2 && removed < 2 && added ^ removed); -- cgit v1.2.3 From f02ca5a6b148d7ab6c33692da84f4601af4fd8c8 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 24 Jan 2013 11:39:12 +0100 Subject: indicator-ng: check return value of g_menu_model_get_item_attribute If it returns false, we'd use uninitialized memory. --- libindicator/indicator-ng.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 82af030..003ec70 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -244,9 +244,11 @@ indicator_ng_menu_changed (GMenuModel *menu, gchar *action; g_clear_pointer (&self->header_action, g_free); - g_menu_model_get_item_attribute (self->menu, 0, G_MENU_ATTRIBUTE_ACTION, "s", &action); - if (action && g_str_has_prefix (action, "indicator.")) - self->header_action = g_strdup (action + 10); + if (g_menu_model_get_item_attribute (self->menu, 0, G_MENU_ATTRIBUTE_ACTION, "s", &action) && + g_str_has_prefix (action, "indicator.")) + { + self->header_action = g_strdup (action + 10); + } popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU); if (popup) -- cgit v1.2.3 From 82ecfaaa89684a7504913fb039d0dd8302c82ec9 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 25 Jan 2013 10:29:57 +0100 Subject: indicator-ng: require header item to have x-canonical-type set --- libindicator/indicator-ng.c | 53 ++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 15 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 003ec70..05ece8d 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -219,6 +219,23 @@ indicator_ng_update_entry (IndicatorNg *self) g_variant_unref (state); } +static gboolean +indicator_ng_menu_item_is_of_type (GMenuModel *menu, + gint index, + const gchar *expected_type) +{ + gchar *type; + gboolean has_type = FALSE; + + if (g_menu_model_get_item_attribute (menu, index, "x-canonical-type", "s", &type)) + { + has_type = g_str_equal (type, expected_type); + g_free (type); + } + + return has_type; +} + static void indicator_ng_menu_changed (GMenuModel *menu, gint position, @@ -240,26 +257,32 @@ indicator_ng_menu_changed (GMenuModel *menu, if (added) { - GMenuModel *popup; - gchar *action; - g_clear_pointer (&self->header_action, g_free); - if (g_menu_model_get_item_attribute (self->menu, 0, G_MENU_ATTRIBUTE_ACTION, "s", &action) && - g_str_has_prefix (action, "indicator.")) - { - self->header_action = g_strdup (action + 10); - } - popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU); - if (popup) + if (indicator_ng_menu_item_is_of_type (self->menu, 0, "com.canonical.indicator.root")) { - gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->entry.menu), popup, NULL, TRUE); - g_object_unref (popup); - } + GMenuModel *popup; + gchar *action; - indicator_ng_update_entry (self); + if (g_menu_model_get_item_attribute (self->menu, 0, G_MENU_ATTRIBUTE_ACTION, "s", &action) && + g_str_has_prefix (action, "indicator.")) + { + self->header_action = g_strdup (action + 10); + } - g_free (action); + popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU); + if (popup) + { + gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->entry.menu), popup, NULL, TRUE); + g_object_unref (popup); + } + + indicator_ng_update_entry (self); + + g_free (action); + } + else + g_warning ("indicator menu item must be of type 'com.canonical.indicator.root'"); } } -- cgit v1.2.3 From 70480923e6151c8173032710beb99707bb5b9485 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 25 Jan 2013 10:46:58 +0100 Subject: indicator-ng: lazily allocate entry.label and entry.image Most indicators only need one of those. --- libindicator/indicator-ng.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 05ece8d..f27fbf0 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -161,11 +161,17 @@ indicator_ng_set_icon_from_string (IndicatorNg *self, if (str == NULL || *str == '\0') { - gtk_image_clear (self->entry.image); - gtk_widget_hide (GTK_WIDGET (self->entry.image)); + if (self->entry.image) + { + gtk_image_clear (self->entry.image); + gtk_widget_hide (GTK_WIDGET (self->entry.image)); + } return; } + if (!self->entry.image) + self->entry.image = g_object_ref_sink (gtk_image_new ()); + gtk_widget_show (GTK_WIDGET (self->entry.image)); icon = g_icon_new_for_string (str, &error); @@ -182,6 +188,24 @@ indicator_ng_set_icon_from_string (IndicatorNg *self, } } +static void +indicator_ng_set_label (IndicatorNg *self, + const gchar *label) +{ + if (label == NULL || *label == '\0') + { + if (self->entry.label) + gtk_widget_hide (GTK_WIDGET (self->entry.label)); + return; + } + + if (!self->entry.label) + self->entry.label = g_object_ref_sink (gtk_label_new (NULL)); + + gtk_label_set_label (GTK_LABEL (self->entry.label), label); + gtk_widget_show (GTK_WIDGET (self->entry.label)); +} + static void indicator_ng_update_entry (IndicatorNg *self) { @@ -207,7 +231,7 @@ indicator_ng_update_entry (IndicatorNg *self) g_variant_get (state, "(&s&s&sb)", &label, &iconstr, &accessible_desc, &visible); - gtk_label_set_label (GTK_LABEL (self->entry.label), label); + indicator_ng_set_label (self, label); indicator_ng_set_icon_from_string (self, iconstr); indicator_ng_set_accessible_desc (self, accessible_desc); indicator_object_set_visible (INDICATOR_OBJECT (self), visible); @@ -407,10 +431,6 @@ indicator_ng_initable_iface_init (GInitableIface *initable) static void indicator_ng_init (IndicatorNg *self) { - self->entry.label = g_object_ref_sink (gtk_label_new (NULL)); - gtk_widget_show (GTK_WIDGET (self->entry.label)); - - self->entry.image = g_object_ref_sink (gtk_image_new ()); self->entry.menu = g_object_ref_sink (gtk_menu_new ()); /* work around IndicatorObject's warning that the accessible -- cgit v1.2.3 From 9c857a30aa23445708c7ed7f1d00a7d0986946bd Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 25 Jan 2013 11:11:59 +0100 Subject: indicator-ng: use indicator_image_helper gtk_icon_set_from_gicon doesn't scale rectangular icons correctly. This adds indicator_image_helper_update_from_gicon() and makes refresh_image() set a broken image instead of erroring out when an icon couldn't be found. --- libindicator/indicator-ng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index f27fbf0..f4c98c6 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -1,5 +1,6 @@ #include "indicator-ng.h" +#include "indicator-image-helper.h" #include @@ -177,7 +178,7 @@ indicator_ng_set_icon_from_string (IndicatorNg *self, icon = g_icon_new_for_string (str, &error); if (icon) { - gtk_image_set_from_gicon (self->entry.image, icon, GTK_ICON_SIZE_LARGE_TOOLBAR); + indicator_image_helper_update_from_gicon (self->entry.image, icon); g_object_unref (icon); } else -- cgit v1.2.3 From c02297da219a3a44d061543ff64bb953e2065128 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 25 Jan 2013 11:14:13 +0100 Subject: indicator-ng: use strlen instead of hard coding the length --- libindicator/indicator-ng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index f4c98c6..bd0a19c 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -292,7 +292,7 @@ indicator_ng_menu_changed (GMenuModel *menu, if (g_menu_model_get_item_attribute (self->menu, 0, G_MENU_ATTRIBUTE_ACTION, "s", &action) && g_str_has_prefix (action, "indicator.")) { - self->header_action = g_strdup (action + 10); + self->header_action = g_strdup (action + strlen ("indicator.")); } popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU); -- cgit v1.2.3 From 8ff25e5375c3a0cb399fa687bf541f1cc0f4a020 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 30 Jan 2013 17:49:32 +0100 Subject: indicator-ng: simplify flow in initable_init --- libindicator/indicator-ng.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index bd0a19c..6ec02b4 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -362,29 +362,28 @@ indicator_ng_initable_init (GInitable *initable, gchar *bus_name = NULL; keyfile = g_key_file_new (); - if (!g_key_file_load_from_file (keyfile, - self->service_file, - G_KEY_FILE_NONE, - error)) - { - g_key_file_free (keyfile); - return FALSE; - } + if (!g_key_file_load_from_file (keyfile, self->service_file, G_KEY_FILE_NONE, error)) + goto out; - if ((self->name = g_key_file_get_string (keyfile, "Indicator Service", "Name", error)) && - (bus_name = g_key_file_get_string (keyfile, "Indicator Service", "BusName", error)) && - (self->object_path = g_key_file_get_string (keyfile, "Indicator Service", "ObjectPath", error))) - { - self->entry.name_hint = self->name; - - self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, - bus_name, - G_BUS_NAME_WATCHER_FLAGS_AUTO_START, - indicator_ng_service_appeared, - indicator_ng_service_vanished, - self, NULL); - } + if (!(self->name = g_key_file_get_string (keyfile, "Indicator Service", "Name", error))) + goto out; + + self->entry.name_hint = self->name; + + if (!(bus_name = g_key_file_get_string (keyfile, "Indicator Service", "BusName", error))) + goto out; + + if (!(self->object_path = g_key_file_get_string (keyfile, "Indicator Service", "ObjectPath", error))) + goto out; + + self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, + bus_name, + G_BUS_NAME_WATCHER_FLAGS_AUTO_START, + indicator_ng_service_appeared, + indicator_ng_service_vanished, + self, NULL); +out: g_free (bus_name); g_key_file_free (keyfile); -- cgit v1.2.3 From f9f86fbfa558e83d8591fbec43e95dcb5cc34584 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 6 Feb 2013 15:37:38 -0500 Subject: indicator-ng: try to restart the service when it crashes This uses a (slightly) awkward heuristic: when the well-known name vanishes from the session bus, it only restarts the service when it didn't explicitly hide the indicator before. --- libindicator/indicator-ng.c | 79 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 5 deletions(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 6ec02b4..b2a95fe 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -11,16 +11,20 @@ struct _IndicatorNg gchar *service_file; gchar *name; gchar *object_path; + gchar *bus_name; gchar *profile; gchar *header_action; guint name_watch_id; + GDBusConnection *session_bus; GActionGroup *actions; GMenuModel *menu; IndicatorObjectEntry entry; gchar *accessible_desc; + + gint64 last_service_restart; }; static void indicator_ng_initable_iface_init (GInitableIface *initable); @@ -111,6 +115,8 @@ indicator_ng_dispose (GObject *object) self->name_watch_id = 0; } + g_clear_object (&self->session_bus); + indicator_ng_free_actions_and_menu (self); g_clear_object (&self->entry.label); @@ -128,6 +134,7 @@ indicator_ng_finalize (GObject *object) g_free (self->service_file); g_free (self->name); g_free (self->object_path); + g_free (self->bus_name); g_free (self->accessible_desc); g_free (self->header_action); @@ -323,6 +330,8 @@ indicator_ng_service_appeared (GDBusConnection *connection, g_assert (!self->actions); g_assert (!self->menu); + self->session_bus = g_object_ref (connection); + self->actions = G_ACTION_GROUP (g_dbus_action_group_get (connection, name_owner, self->object_path)); gtk_widget_insert_action_group (GTK_WIDGET (self->entry.menu), "indicator", self->actions); g_signal_connect_swapped (self->actions, "action-added", G_CALLBACK (indicator_ng_update_entry), self); @@ -340,6 +349,41 @@ indicator_ng_service_appeared (GDBusConnection *connection, g_free (menu_object_path); } +static void +indicator_ng_service_started (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + IndicatorNg *self = user_data; + GError *error = NULL; + GVariant *reply; + + reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), result, &error); + if (!reply) + { + g_warning ("Could not activate service '%s': %s", self->name, error->message); + indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); + g_error_free (error); + return; + } + + switch (g_variant_get_uint32 (reply)) + { + case 1: /* DBUS_START_REPLY_SUCCESS */ + break; + + case 2: /* DBUS_START_REPLY_ALREADY_RUNNING */ + g_warning ("could not start service '%s': it is already running", self->name); + indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); + break; + + default: + g_assert_not_reached (); + } + + g_variant_unref (reply); +} + static void indicator_ng_service_vanished (GDBusConnection *connection, const gchar *name, @@ -349,7 +393,34 @@ indicator_ng_service_vanished (GDBusConnection *connection, indicator_ng_free_actions_and_menu (self); - indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); + /* Names may vanish because the service decided it doesn't need to + * show its indicator anymore, or because it crashed. Let's assume it + * crashes and restart it unless it explicitly hid its indicator. */ + + if (indicator_object_entry_is_visible (INDICATOR_OBJECT (self), &self->entry)) + { + gint64 now; + + /* take care not to start it if it repeatedly crashes */ + now = g_get_monotonic_time (); + if (now - self->last_service_restart < 1 * G_USEC_PER_SEC) + return; + + self->last_service_restart = now; + + g_dbus_connection_call (self->session_bus, + "org.freedesktop.DBus", + "/", + "org.freedesktop.DBus", + "StartServiceByName", + g_variant_new ("(su)", self->bus_name, 0), + G_VARIANT_TYPE ("(u)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + indicator_ng_service_started, + self); + } } static gboolean @@ -359,7 +430,6 @@ indicator_ng_initable_init (GInitable *initable, { IndicatorNg *self = INDICATOR_NG (initable); GKeyFile *keyfile; - gchar *bus_name = NULL; keyfile = g_key_file_new (); if (!g_key_file_load_from_file (keyfile, self->service_file, G_KEY_FILE_NONE, error)) @@ -370,21 +440,20 @@ indicator_ng_initable_init (GInitable *initable, self->entry.name_hint = self->name; - if (!(bus_name = g_key_file_get_string (keyfile, "Indicator Service", "BusName", error))) + if (!(self->bus_name = g_key_file_get_string (keyfile, "Indicator Service", "BusName", error))) goto out; if (!(self->object_path = g_key_file_get_string (keyfile, "Indicator Service", "ObjectPath", error))) goto out; self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, - bus_name, + self->bus_name, G_BUS_NAME_WATCHER_FLAGS_AUTO_START, indicator_ng_service_appeared, indicator_ng_service_vanished, self, NULL); out: - g_free (bus_name); g_key_file_free (keyfile); return self->name_watch_id > 0; -- cgit v1.2.3 From 88aa74b63ee73620f265a5cfa474fd19b5cf9ad7 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 6 Feb 2013 16:03:33 -0500 Subject: indicator-ng: don't hide the indicator if the service is already running --- libindicator/indicator-ng.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index b2a95fe..481a37c 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -374,7 +374,6 @@ indicator_ng_service_started (GObject *source_object, case 2: /* DBUS_START_REPLY_ALREADY_RUNNING */ g_warning ("could not start service '%s': it is already running", self->name); - indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); break; default: -- cgit v1.2.3 From 40d7c42d5212dc97ce6b07f05828fb62440d0694 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 14 Feb 2013 16:16:48 -0500 Subject: indicator-ng: add license header --- libindicator/indicator-ng.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libindicator/indicator-ng.c') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 481a37c..f2b957b 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -1,3 +1,21 @@ +/* + * Copyright 2013 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Lars Uebernickel + */ #include "indicator-ng.h" #include "indicator-image-helper.h" -- cgit v1.2.3