Indicator Applet

Merge lp://staging/~ken-vandine/indicator-applet/python-v2work into lp://staging/indicator-applet/python0.2

  1. python-v2work
  2. Merge into indicate-python
Proposed by Ken VanDine
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~ken-vandine/indicator-applet/python-v2work
Merge into: lp://staging/indicator-applet/python0.2
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~ken-vandine/indicator-applet/python-v2work
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+11968@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Updated the im-client example for v2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2009-08-05 10:26:04 +0000
3+++ configure.ac 2009-09-14 15:56:26 +0000
4@@ -1,16 +1,16 @@
5-AC_INIT(indicate-python, 0.0.3, eitan@ascender.com)
6+AC_INIT(indicate-python, 0.2.0, eitan@ascender.com)
7 AC_PREREQ(2.50)
8 AC_CONFIG_SRCDIR(config.h.in)
9 AC_COPYRIGHT([Copyright 2009 Canonical])
10
11 PACKAGE=indicate-python
12-VERSION=0.0.3
13+VERSION=0.2.0
14
15 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
16 AM_CONFIG_HEADER(config.h)
17
18 PYGTK_REQUIRED=2.14.0
19-LIBINDICATE_REQUIRED=0.1.1
20+LIBINDICATE_REQUIRED=0.2.0
21 PYGOBJECT_REQUIRED=0.22
22
23 AM_MAINTAINER_MODE
24
25=== modified file 'src/indicate.defs'
26--- src/indicate.defs 2009-04-10 15:17:38 +0000
27+++ src/indicate.defs 2009-09-14 18:36:15 +0000
28@@ -7,13 +7,6 @@
29 (gtype-id "INDICATE_TYPE_INDICATOR")
30 )
31
32-(define-object IndicatorMessage
33- (in-module "Indicate")
34- (parent "IndicateIndicator")
35- (c-name "IndicateIndicatorMessage")
36- (gtype-id "INDICATE_TYPE_INDICATOR_MESSAGE")
37-)
38-
39 (define-object Listener
40 (in-module "Indicate")
41 (parent "GObject")
42@@ -83,12 +76,6 @@
43 (return-type "guint")
44 )
45
46-(define-method get_indicator_type
47- (of-object "IndicateIndicator")
48- (c-name "indicate_indicator_get_indicator_type")
49- (return-type "const-gchar*")
50-)
51-
52 (define-method user_display
53 (of-object "IndicateIndicator")
54 (c-name "indicate_indicator_user_display")
55@@ -125,6 +112,26 @@
56 )
57 )
58
59+(define-method set_property_int
60+ (of-object "IndicateIndicator")
61+ (c-name "indicate_indicator_set_property_int")
62+ (return-type "none")
63+ (parameters
64+ '("const-gchar*" "key")
65+ '("gint" "value")
66+ )
67+)
68+
69+(define-method set_property_bool
70+ (of-object "IndicateIndicator")
71+ (c-name "indicate_indicator_set_property_bool")
72+ (return-type "none")
73+ (parameters
74+ '("const-gchar*" "key")
75+ '("gboolean" "value")
76+ )
77+)
78+
79 (define-method get_property
80 (of-object "IndicateIndicator")
81 (c-name "indicate_indicator_get_property")
82@@ -140,21 +147,20 @@
83 (return-type "GPtrArray*")
84 )
85
86-
87-
88-;; From indicator-message.h
89-
90-(define-function indicate_indicator_message_get_type
91- (c-name "indicate_indicator_message_get_type")
92- (return-type "GType")
93-)
94-
95-(define-function indicate_indicator_message_new
96- (c-name "indicate_indicator_message_new")
97- (is-constructor-of "IndicateIndicatorMessage")
98- (return-type "IndicateIndicatorMessage*")
99-)
100-
101+(define-method set_displayed
102+ (of-object "IndicateIndicator")
103+ (c-name "indicate_indicator_set_displayed")
104+ (return-type "none")
105+ (parameters
106+ '("gboolean" "displayed")
107+ )
108+)
109+
110+(define-method get_displayed
111+ (of-object "IndicateIndicator")
112+ (c-name "indicate_indicator_get_displayed")
113+ (return-type "gboolean")
114+)
115
116
117 ;; From listener.h
118@@ -350,6 +356,15 @@
119 )
120 )
121
122+(define-method set_count
123+ (of-object "IndicateServer")
124+ (c-name "indicate_server_set_count")
125+ (return-type "none")
126+ (parameters
127+ '("guint" "count")
128+ )
129+)
130+
131 (define-method show
132 (of-object "IndicateServer")
133 (c-name "indicate_server_show")
134@@ -397,41 +412,21 @@
135 (return-type "none")
136 )
137
138-(define-method emit_indicator_added
139- (of-object "IndicateServer")
140- (c-name "indicate_server_emit_indicator_added")
141- (return-type "none")
142- (parameters
143- '("guint" "id")
144- '("const-gchar*" "type")
145- )
146-)
147-
148-(define-method emit_indicator_removed
149- (of-object "IndicateServer")
150- (c-name "indicate_server_emit_indicator_removed")
151- (return-type "none")
152- (parameters
153- '("guint" "id")
154- '("const-gchar*" "type")
155- )
156-)
157-
158-(define-method emit_indicator_modified
159- (of-object "IndicateServer")
160- (c-name "indicate_server_emit_indicator_modified")
161- (return-type "none")
162- (parameters
163- '("guint" "id")
164- '("const-gchar*" "property")
165- )
166-)
167-
168-(define-method emit_server_display
169- (of-object "IndicateServer")
170- (c-name "indicate_server_emit_server_display")
171- (return-type "none")
172-)
173+(define-method check_interest
174+ (of-object "IndicateServer")
175+ (c-name "indicate_server_check_interest")
176+ (return-type "gboolean")
177+ (parameters
178+ '("IndicateInterests" "interest")
179+ )
180+)
181+
182+(define-method get_max_indicators
183+ (of-object "IndicateServer")
184+ (c-name "indicate_server_get_max_indicators")
185+ (return-type "gint")
186+)
187+
188
189
190
191
192=== modified file 'src/indicate.override'
193--- src/indicate.override 2009-08-05 10:26:04 +0000
194+++ src/indicate.override 2009-09-14 16:41:57 +0000
195@@ -28,7 +28,7 @@
196 headers
197 #include <Python.h>
198 #include <libindicate/indicator.h>
199-#include <libindicate/indicator-message.h>
200+#include <libindicate/indicator-messages.h>
201 #include <libindicate/listener.h>
202 #include <libindicate/server.h>
203 #include <libindicate/interests.h>
204
205=== modified file 'tests/im-client.py'
206--- tests/im-client.py 2009-04-08 15:35:22 +0000
207+++ tests/im-client.py 2009-09-17 13:43:21 +0000
208@@ -29,8 +29,8 @@
209 import gtk
210 from time import time
211
212-PATHA = "/usr/share/icons/hicolor/16x16/apps/pidgin.png"
213-PATHB = "/usr/share/icons/hicolor/22x22/apps/pidgin.png"
214+PATHA = "/usr/share/icons/hicolor/16x16/apps/empathy.png"
215+PATHB = "/usr/share/icons/hicolor/22x22/apps/empathy.png"
216 lastpath = None
217
218 def timeout_cb(indicator):
219@@ -58,10 +58,10 @@
220 if __name__ == "__main__":
221 server = indicate.indicate_server_ref_default()
222 server.set_type("message.im")
223- server.set_desktop_file("/usr/share/applications/pidgin.desktop")
224+ server.set_desktop_file("/usr/share/applications/empathy.desktop")
225 server.connect("server-display", server_display)
226
227- indicator = indicate.IndicatorMessage()
228+ indicator = indicate.Indicator()
229 indicator.set_property("subtype", "im")
230 indicator.set_property("sender", "IM Client Test")
231 indicator.set_property_time("time", time())

Subscribers

People subscribed via source and target branches