diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
commit | 95daf102dac37a69686f8a86bf7fe47cd442c7d6 (patch) | |
tree | 3891a7075873c6eeb320fe0c8a572ca14655f5af /libindicator/indicator-object.h | |
parent | 4f4190f71f8495e5bcf6779d73157931572e42ac (diff) | |
parent | 1cf6a9761db8beefc8d2a73c2cf9903264424c66 (diff) | |
download | libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.gz libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.bz2 libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.zip |
"bzr merge lp:indicator" + conflict resolution in tests suite
Diffstat (limited to 'libindicator/indicator-object.h')
-rw-r--r-- | libindicator/indicator-object.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index 803f1b3..ca78437 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -130,6 +130,7 @@ struct _IndicatorObjectClass { void (*entry_was_added) (IndicatorObject * io, IndicatorObjectEntry * entry); void (*entry_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); + void (*entry_activate_window) (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp); void (*entry_close) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); /* Signals */ @@ -197,6 +198,7 @@ guint indicator_object_get_location (IndicatorObject * io, IndicatorObjectEntr guint indicator_object_get_show_now (IndicatorObject * io, IndicatorObjectEntry * entry); void indicator_object_set_visible (IndicatorObject * io, gboolean visible); void indicator_object_entry_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); +void indicator_object_entry_activate_window (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp); void indicator_object_entry_close (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); void indicator_object_set_environment (IndicatorObject * io, const GStrv env); |