diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-12-19 18:26:43 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-12-19 18:26:43 +0100 |
| commit | 96c6d4e85043859e472cc76a5c97a8e9e01922c2 (patch) | |
| tree | 71b63cec040af85f7895629bee82cf7ba74630c7 /services | |
| parent | 4ad7d2f910004ca80bc93403ca4f9b0787639214 (diff) | |
PanelService, DBusIndicators, IndicatorEntry: add a parent_window parameter to Entry
(bzr r3899.2.4)
Diffstat (limited to 'services')
| -rw-r--r-- | services/panel-service-private.h | 2 | ||||
| -rw-r--r-- | services/panel-service.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/services/panel-service-private.h b/services/panel-service-private.h index fe973f06b..00e1d4fd4 100644 --- a/services/panel-service-private.h +++ b/services/panel-service-private.h @@ -33,7 +33,7 @@ extern "C" { #define UPS_PATH "/com/canonical/Unity/Panel/Service" #define UPS_IFACE "com.canonical.Unity.Panel.Service" -#define ENTRY_SIGNATURE "(ssssbbusbbi)" +#define ENTRY_SIGNATURE "(sssusbbusbbi)" #define ENTRY_ARRAY_SIGNATURE "a" ENTRY_SIGNATURE "" #define AltMask Mod1Mask diff --git a/services/panel-service.c b/services/panel-service.c index 393871b7f..1636e0a0e 100644 --- a/services/panel-service.c +++ b/services/panel-service.c @@ -1611,6 +1611,7 @@ indicator_entry_to_variant (IndicatorObjectEntry *entry, indicator_id, id, entry->name_hint ? entry->name_hint : "", + entry->parent_window, is_label ? gtk_label_get_label (entry->label) : "", is_label ? gtk_widget_get_sensitive (GTK_WIDGET (entry->label)) : FALSE, is_label ? gtk_widget_get_visible (GTK_WIDGET (entry->label)) : FALSE, @@ -1631,10 +1632,11 @@ indicator_entry_null_to_variant (const gchar *indicator_id, indicator_id, "", "", + 0, "", FALSE, FALSE, - (guint32) 0, + 0, "", FALSE, FALSE, |