libindicator

Merge lp:~3v1n0/libindicator/parent-window into lp:libindicator/14.04

  1. parent-window
  2. Merge into trunk.14.04
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Lars Karlitski
Approved revision: no longer in the source branch.
Merged at revision: 524
Proposed branch: lp:~3v1n0/libindicator/parent-window
Merge into: lp:libindicator/14.04
Diff against target: 66 lines (+8/-3)
2 files modified
libindicator/indicator-object.c (+5/-0)
libindicator/indicator-object.h (+3/-3)
To merge this branch: bzr merge lp:~3v1n0/libindicator/parent-window
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
Review via email: mp+206936@code.launchpad.net

Commit message

IndicatorObject: add parent_window parameter to IndicatorEntry

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

Looks good to me.

review: Approve
lp:~3v1n0/libindicator/parent-window updated
524. By Marco Trevisan (Treviño)

IndicatorObject: add parent_window parameter to IndicatorEntry

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicator/indicator-object.c'
2--- libindicator/indicator-object.c 2013-06-28 20:03:16 +0000
3+++ libindicator/indicator-object.c 2014-02-18 13:54:50 +0000
4@@ -314,6 +314,7 @@
5 priv->entry.image = NULL;
6 priv->entry.accessible_desc = NULL;
7 priv->entry.name_hint = NULL;
8+ priv->entry.parent_window = 0;
9
10 priv->gotten_entries = FALSE;
11 priv->default_visibility = TRUE;
12@@ -527,6 +528,10 @@
13 priv->entry.name_hint = class->get_name_hint(io);
14 }
15
16+ if (class->get_parent_window) {
17+ priv->entry.parent_window = class->get_parent_window(io);
18+ }
19+
20 priv->gotten_entries = TRUE;
21 }
22
23
24=== modified file 'libindicator/indicator-object.h'
25--- libindicator/indicator-object.h 2013-06-28 18:30:33 +0000
26+++ libindicator/indicator-object.h 2014-02-18 13:54:50 +0000
27@@ -145,12 +145,12 @@
28 void (*secondary_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
29
30 gint (*get_position) (IndicatorObject *io);
31+ guint (*get_parent_window) (IndicatorObject *io);
32
33 /* Reserved */
34 void (*reserved1) (void);
35 void (*reserved2) (void);
36 void (*reserved3) (void);
37- void (*reserved4) (void);
38 };
39
40 /**
41@@ -174,11 +174,11 @@
42 of the indicator
43 @name_hint: A name to describe the indicator being placed to allow
44 the caller to be more aware of the individual entries.
45+ @parent_window: the id of the parent window of the indicator entry (if any).
46
47 @reserved1: Reserved for future use
48 @reserved2: Reserved for future use
49 @reserved3: Reserved for future use
50- @reserved4: Reserved for future use
51 */
52 struct _IndicatorObjectEntry {
53 IndicatorObject * parent_object;
54@@ -187,11 +187,11 @@
55 GtkMenu * menu;
56 const gchar * accessible_desc;
57 const gchar * name_hint;
58+ guint parent_window;
59
60 void (*reserved1) (void);
61 void (*reserved2) (void);
62 void (*reserved3) (void);
63- void (*reserved4) (void);
64 };
65
66 GType indicator_object_get_type (void);

Subscribers

People subscribed via source and target branches