libindicator

Merge lp:~3v1n0/libindicator/scroll-api-merge into lp:libindicator/0.4

  1. scroll-api-merge
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 409
Proposed branch: lp:~3v1n0/libindicator/scroll-api-merge
Merge into: lp:libindicator/0.4
Diff against target: 101 lines (+8/-30)
3 files modified
libindicator/indicator-object-marshal.list (+0/-1)
libindicator/indicator-object.c (+4/-23)
libindicator/indicator-object.h (+4/-6)
To merge this branch: bzr merge lp:~3v1n0/libindicator/scroll-api-merge
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+66676@code.launchpad.net

Description of the change

Merging "scroll" and "scroll-entry" into the "entry-scrolled" signal

API change to merge the duplication of signals, as defined in the blueprint desktop-dx-o-indicators-review.

See related bug #804618 for related changes to be merged.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicator/indicator-object-marshal.list'
2--- libindicator/indicator-object-marshal.list 2011-01-26 23:12:42 +0000
3+++ libindicator/indicator-object-marshal.list 2011-07-02 03:52:29 +0000
4@@ -1,5 +1,4 @@
5 VOID: POINTER, UINT, UINT
6-VOID: UINT, ENUM
7 VOID: POINTER, UINT, ENUM
8 VOID: POINTER, UINT
9 VOID: POINTER, BOOLEAN
10
11=== modified file 'libindicator/indicator-object.c'
12--- libindicator/indicator-object.c 2011-03-22 15:57:30 +0000
13+++ libindicator/indicator-object.c 2011-07-02 03:52:29 +0000
14@@ -59,8 +59,7 @@
15 ENTRY_ADDED,
16 ENTRY_REMOVED,
17 ENTRY_MOVED,
18- SCROLL,
19- SCROLL_ENTRY,
20+ ENTRY_SCROLLED,
21 MENU_SHOW,
22 SHOW_NOW_CHANGED,
23 ACCESSIBLE_DESC_UPDATE,
24@@ -151,26 +150,8 @@
25 _indicator_object_marshal_VOID__POINTER_UINT_UINT,
26 G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE);
27
28- /**
29- IndicatorObject::scroll:
30- @arg0: The #IndicatorObject object
31- @arg1: The delta of the scroll event
32- @arg2: The orientation of the scroll event.
33-
34- When the indicator receives a mouse scroll wheel event
35- from the user, this signal is emitted.
36- */
37- signals[SCROLL] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL,
38- G_TYPE_FROM_CLASS(klass),
39- G_SIGNAL_RUN_LAST,
40- G_STRUCT_OFFSET (IndicatorObjectClass, scroll),
41- NULL, NULL,
42- _indicator_object_marshal_VOID__UINT_ENUM,
43- G_TYPE_NONE, 2, G_TYPE_UINT,
44- INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION);
45-
46 /**
47- IndicatorObject::scroll-entry:
48+ IndicatorObject::entry-scrolled:
49 @arg0: The #IndicatorObject object
50 @arg1: A pointer to the #IndicatorObjectEntry that
51 receives the scroll event.
52@@ -180,10 +161,10 @@
53 When the indicator receives a mouse scroll wheel event
54 from the user, this signal is emitted.
55 */
56- signals[SCROLL_ENTRY] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY,
57+ signals[ENTRY_SCROLLED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED,
58 G_TYPE_FROM_CLASS(klass),
59 G_SIGNAL_RUN_LAST,
60- G_STRUCT_OFFSET (IndicatorObjectClass, scroll_entry),
61+ G_STRUCT_OFFSET (IndicatorObjectClass, entry_scrolled),
62 NULL, NULL,
63 _indicator_object_marshal_VOID__POINTER_UINT_ENUM,
64 G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT,
65
66=== modified file 'libindicator/indicator-object.h'
67--- libindicator/indicator-object.h 2011-03-22 15:57:30 +0000
68+++ libindicator/indicator-object.h 2011-07-02 03:52:29 +0000
69@@ -49,10 +49,8 @@
70 #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE))
71 #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved"
72 #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE))
73-#define INDICATOR_OBJECT_SIGNAL_SCROLL "scroll"
74-#define INDICATOR_OBJECT_SIGNAL_SCROLL_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SCROLL, INDICATOR_OBJECT_TYPE))
75-#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY "scroll-entry"
76-#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY_ID (g_signal_lookup(#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY, INDICATOR_OBJECT_TYPE))
77+#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED "entry-scrolled"
78+#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE))
79 #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW "menu-show"
80 #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE))
81 #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED "show-now-changed"
82@@ -96,6 +94,7 @@
83 @entry_removed: Slot for #IndicatorObject::entry-removed
84 @entry_moved: Slot for #IndicatorObject::entry-moved
85 @menu_show: Slot for #IndicatorObject::menu-show
86+ @entry_scrolled: Slot for #IndicatorObject::entry-scrolled
87 @show_now_changed: Slot for #IndicatorObject::show-now-changed
88 @accessible_desc_update: Slot for #IndicatorObject::accessible-desc-update
89 */
90@@ -119,10 +118,9 @@
91 void (*entry_added) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
92 void (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
93 void (*entry_moved) (IndicatorObject * io, IndicatorObjectEntry * entry, guint old_pos, guint new_pos, gpointer user_data);
94- void (*scroll) (IndicatorObject * io, gint delta, IndicatorScrollDirection direction);
95+ void (*entry_scrolled) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
96 void (*menu_show) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
97 void (*show_now_changed) (IndicatorObject * io, IndicatorObjectEntry * entry, gboolean show_now_state, gpointer user_data);
98- void (*scroll_entry) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
99 void (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
100
101 /* Reserved */

Subscribers

People subscribed via source and target branches