libindicate

Merge lp:~ted/libindicate/ayatanize into lp:libindicate/0.6

  1. ayatanize
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/libindicate/ayatanize
Merge into: lp:libindicate/0.6
Prerequisite: lp:~ted/libindicate/discovery-and-love
Diff against target: 288 lines (+71/-23)
9 files modified
.bzrignore (+11/-0)
libindicate-gtk/Makefile.am (+1/-0)
libindicate-gtk/listener.c (+1/-1)
libindicate/Makefile.am (+1/-0)
libindicate/dbus-shared.h (+34/-0)
libindicate/indicate-interface.xml (+1/-1)
libindicate/indicate-listener.xml (+1/-1)
libindicate/listener.c (+17/-17)
libindicate/server.c (+4/-3)
To merge this branch: bzr merge lp:~ted/libindicate/ayatanize
Reviewer Review Type Date Requested Status
David Barth Approve
Review via email: mp+18575@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Changing to the org.ayatana namespace

Revision history for this message
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-10-11 16:09:33 +0000
3+++ .bzrignore 2010-02-03 23:01:11 +0000
4@@ -154,3 +154,14 @@
5 libindicate-gtk/Indicate-Gtk-0.2.typelib
6 libindicate-[0-9].[0-9].[0-9].tar.gz
7 libindicate-[0-9].[0-9].[0-9].tar.gz.asc
8+tests/test-indicator-display
9+tests/test-indicator-display-half
10+tests/test-interests
11+tests/test-interests-multi
12+tests/test-max-indicators
13+tests/test-max-indicators-repeat
14+tests/test-menu
15+tests/test-menu-client
16+tests/test-menu-server
17+tests/test-simple
18+tests/test-thousand-indicators
19
20=== modified file 'libindicate-gtk/Makefile.am'
21--- libindicate-gtk/Makefile.am 2009-10-11 16:04:14 +0000
22+++ libindicate-gtk/Makefile.am 2010-02-03 23:01:11 +0000
23@@ -29,6 +29,7 @@
24
25 libindicate_gtk_la_CFLAGS = \
26 -I $(srcdir)/.. \
27+ -Wall -Werror \
28 $(LIBINDICATEGTK_CFLAGS)
29
30 libindicate_gtk_la_LIBADD = \
31
32=== modified file 'libindicate-gtk/listener.c'
33--- libindicate-gtk/listener.c 2009-09-08 20:59:59 +0000
34+++ libindicate-gtk/listener.c 2010-02-03 23:01:11 +0000
35@@ -136,7 +136,7 @@
36 get_property_data->property = g_strdup(property);
37 get_property_data->type = prop_type;
38
39- org_freedesktop_indicator_get_indicator_property_async (server->proxy , INDICATE_LISTENER_INDICATOR_ID(indicator), property, get_property_cb, get_property_data);
40+ org_ayatana_indicate_get_indicator_property_async (server->proxy , INDICATE_LISTENER_INDICATOR_ID(indicator), property, get_property_cb, get_property_data);
41 return;
42 }
43
44
45=== modified file 'libindicate/Makefile.am'
46--- libindicate/Makefile.am 2009-10-11 16:04:14 +0000
47+++ libindicate/Makefile.am 2010-02-03 23:01:11 +0000
48@@ -46,6 +46,7 @@
49 dbus-indicate-client.h \
50 dbus-listener-server.h \
51 dbus-listener-client.h \
52+ dbus-shared.h \
53 indicate-enum-types.c \
54 server.c \
55 server-marshal.c \
56
57=== added file 'libindicate/dbus-shared.h'
58--- libindicate/dbus-shared.h 1970-01-01 00:00:00 +0000
59+++ libindicate/dbus-shared.h 2010-02-03 23:01:11 +0000
60@@ -0,0 +1,34 @@
61+/*
62+Some common interfaces that get used all over.
63+
64+Copyright 2010 Canonical Ltd.
65+
66+Authors:
67+ Ted Gould <ted@canonical.com>
68+
69+This program is free software: you can redistribute it and/or modify it
70+under the terms of either or both of the following licenses:
71+
72+1) the GNU Lesser General Public License version 3, as published by the
73+Free Software Foundation; and/or
74+2) the GNU Lesser General Public License version 2.1, as published by
75+the Free Software Foundation.
76+
77+This program is distributed in the hope that it will be useful, but
78+WITHOUT ANY WARRANTY; without even the implied warranties of
79+MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
80+PURPOSE. See the applicable version of the GNU Lesser General Public
81+License for more details.
82+
83+You should have received a copy of both the GNU Lesser General Public
84+License version 3 and version 2.1 along with this program. If not, see
85+<http://www.gnu.org/licenses/>
86+*/
87+
88+#ifndef INDICATE_DBUS_SHARED
89+#define INDICATE_DBUS_SHARED
90+
91+#define INDICATE_DBUS_IFACE "org.ayatana.indicate"
92+#define INDICATE_LISTENER_DBUS_IFACE "org.ayatana.indicate.listener"
93+
94+#endif /* INDICATE_DBUS_SHARED */
95
96=== modified file 'libindicate/indicate-interface.xml'
97--- libindicate/indicate-interface.xml 2010-02-01 01:45:54 +0000
98+++ libindicate/indicate-interface.xml 2010-02-03 23:01:11 +0000
99@@ -28,7 +28,7 @@
100 <http://www.gnu.org/licenses/>
101 -->
102 <node name="/">
103- <interface name="org.freedesktop.indicator">
104+ <interface name="org.ayatana.indicate">
105
106 <!-- Properties -->
107 <property name="desktop" type="s" access="read" />
108
109=== modified file 'libindicate/indicate-listener.xml'
110--- libindicate/indicate-listener.xml 2010-02-03 23:01:11 +0000
111+++ libindicate/indicate-listener.xml 2010-02-03 23:01:11 +0000
112@@ -28,7 +28,7 @@
113 <http://www.gnu.org/licenses/>
114 -->
115 <node name="/">
116- <interface name="org.freedesktop.indicator.listener">
117+ <interface name="org.ayatana.indicate.listener">
118
119 <!-- Functions -->
120 <method name="GetIndicatorServers">
121
122=== modified file 'libindicate/listener.c'
123--- libindicate/listener.c 2010-02-03 23:01:11 +0000
124+++ libindicate/listener.c 2010-02-03 23:01:11 +0000
125@@ -35,6 +35,7 @@
126 #include "dbus-indicate-client.h"
127 #include "dbus-listener-client.h"
128 #include "interests-priv.h"
129+#include "dbus-shared.h"
130
131 /* Errors */
132 enum {
133@@ -214,17 +215,16 @@
134
135 priv->max_indicators = -1;
136
137+ dbus_g_connection_register_g_object(priv->session_bus,
138+ "/org/ayatana/indicate/listener",
139+ G_OBJECT(listener));
140+
141 /* WARNING */
142 /* Starting massive asynchronisity */
143 /* */
144
145 dbus_connection_add_filter(dbus_g_connection_get_connection(priv->session_bus), dbus_filter_show_server, listener, NULL);
146- dbus_bus_add_match(dbus_g_connection_get_connection(priv->session_bus), "type='signal',interface='org.freedesktop.indicator',member='ServerShow'", NULL);
147-
148- dbus_g_connection_register_g_object(priv->session_bus,
149- "/org/freedesktop/indicator/listener",
150-// dbus_bus_get_unique_name(dbus_g_connection_get_connection(priv->session_bus)),
151- G_OBJECT(listener));
152+ dbus_bus_add_match(dbus_g_connection_get_connection(priv->session_bus), "type='signal',interface='" INDICATE_DBUS_IFACE "',member='ServerShow'", NULL);
153
154 g_signal_emit(G_OBJECT(listener), signals[INDICATOR_SERVERS_REPORT], 0, TRUE);
155
156@@ -302,7 +302,7 @@
157 static DBusHandlerResult
158 dbus_filter_show_server (DBusConnection * connection, DBusMessage * message, void * user_data)
159 {
160- if (!dbus_message_is_signal(message, "org.freedesktop.indicator", "ServerShow")) {
161+ if (!dbus_message_is_signal(message, INDICATE_DBUS_IFACE, "ServerShow")) {
162 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
163 }
164
165@@ -459,7 +459,7 @@
166 proxyt->proxy = dbus_g_proxy_new_for_name_owner(todo->bus,
167 proxyt->name,
168 todo->path,
169- "org.freedesktop.indicator",
170+ INDICATE_DBUS_IFACE,
171 &error);
172
173 g_free(todo);
174@@ -510,11 +510,11 @@
175 first couple. */
176 proxyt->server.max_indicators = priv->max_indicators;
177 if (proxyt->server.max_indicators != -1) {
178- org_freedesktop_indicator_set_max_indicators_async(proxyt->proxy, proxyt->server.max_indicators, set_max_indicators_cb, proxyt->name);
179+ org_ayatana_indicate_set_max_indicators_async(proxyt->proxy, proxyt->server.max_indicators, set_max_indicators_cb, proxyt->name);
180 }
181
182 indicate_listener_server_get_type(proxyt->listener, &proxyt->server, get_type_initial_cb, proxyt);
183- org_freedesktop_indicator_get_indicator_list_async(proxyt->proxy, proxy_get_indicator_list, proxyt);
184+ org_ayatana_indicate_get_indicator_list_async(proxyt->proxy, proxy_get_indicator_list, proxyt);
185
186 return TRUE;
187 }
188@@ -790,7 +790,7 @@
189 get_property_data->property = g_strdup(property);
190 get_property_data->type = prop_type;
191
192- org_freedesktop_indicator_get_indicator_property_async (server->proxy , INDICATE_LISTENER_INDICATOR_ID(indicator), property, get_property_cb, get_property_data);
193+ org_ayatana_indicate_get_indicator_property_async (server->proxy , INDICATE_LISTENER_INDICATOR_ID(indicator), property, get_property_cb, get_property_data);
194 return;
195 }
196
197@@ -904,7 +904,7 @@
198 void
199 indicate_listener_display (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator)
200 {
201- org_freedesktop_indicator_show_indicator_to_user_async (server->proxy, INDICATE_LISTENER_INDICATOR_ID(indicator), listener_display_cb, NULL);
202+ org_ayatana_indicate_show_indicator_to_user_async (server->proxy, INDICATE_LISTENER_INDICATOR_ID(indicator), listener_display_cb, NULL);
203
204 return;
205 }
206@@ -935,7 +935,7 @@
207 void
208 indicate_listener_displayed (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gboolean displayed)
209 {
210- org_freedesktop_indicator_indicator_displayed_async (server->proxy,
211+ org_ayatana_indicate_indicator_displayed_async (server->proxy,
212 INDICATE_LISTENER_INDICATOR_ID(indicator),
213 displayed,
214 listener_displayed_cb,
215@@ -1055,7 +1055,7 @@
216 property_cb,
217 localdata,
218 NULL,
219- G_TYPE_STRING, "org.freedesktop.indicator",
220+ G_TYPE_STRING, INDICATE_DBUS_IFACE,
221 G_TYPE_STRING, property_name,
222 G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID);
223
224@@ -1137,7 +1137,7 @@
225 }
226
227 if (!server->interests[interest]) {
228- org_freedesktop_indicator_show_interest_async (server->proxy, interest_to_string(interest), interest_cb, server);
229+ org_ayatana_indicate_show_interest_async (server->proxy, interest_to_string(interest), interest_cb, server);
230 server->interests[interest] = TRUE;
231 }
232 return;
233@@ -1147,7 +1147,7 @@
234 indicate_listener_server_remove_interest (IndicateListener * listener, IndicateListenerServer * server, IndicateInterests interest)
235 {
236 if (server->interests[interest]) {
237- org_freedesktop_indicator_remove_interest_async (server->proxy, interest_to_string(interest), interest_cb, server);
238+ org_ayatana_indicate_remove_interest_async (server->proxy, interest_to_string(interest), interest_cb, server);
239 server->interests[interest] = FALSE;
240 }
241 return;
242@@ -1222,7 +1222,7 @@
243
244 if (server->max_indicators != max) {
245 server->max_indicators = max;
246- org_freedesktop_indicator_set_max_indicators_async(server->proxy, server->max_indicators, set_max_indicators_cb, server->name);
247+ org_ayatana_indicate_set_max_indicators_async(server->proxy, server->max_indicators, set_max_indicators_cb, server->name);
248 }
249
250 return;
251
252=== modified file 'libindicate/server.c'
253--- libindicate/server.c 2010-02-03 23:01:11 +0000
254+++ libindicate/server.c 2010-02-03 23:01:11 +0000
255@@ -33,6 +33,7 @@
256 #include <dbus/dbus-glib.h>
257 #include <dbus/dbus-glib-lowlevel.h>
258 #include <libdbusmenu-glib/server.h>
259+#include "dbus-shared.h"
260
261 /* Errors */
262 enum {
263@@ -391,7 +392,7 @@
264
265 IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
266
267- priv->path = g_strdup("/org/freedesktop/indicate");
268+ priv->path = g_strdup("/org/ayatana/indicate");
269 priv->indicators = NULL;
270 priv->num_hidden = 0;
271 priv->visible = FALSE;
272@@ -412,7 +413,7 @@
273 priv->connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
274
275 dbus_connection_add_filter(dbus_g_connection_get_connection(priv->connection), dbus_filter_new_listener, server, NULL);
276- dbus_bus_add_match(dbus_g_connection_get_connection(priv->connection), "type='signal',interface='org.freedesktop.indicator.listener',member='IndicatorServersReport'", NULL);
277+ dbus_bus_add_match(dbus_g_connection_get_connection(priv->connection), "type='signal',interface='" INDICATE_LISTENER_DBUS_IFACE "',member='IndicatorServersReport'", NULL);
278
279 return;
280 }
281@@ -537,7 +538,7 @@
282 static DBusHandlerResult
283 dbus_filter_new_listener (DBusConnection * connection, DBusMessage * message, void * user_data)
284 {
285- if (!dbus_message_is_signal(message, "org.freedesktop.indicator.listener", "IndicatorServersReport")) {
286+ if (!dbus_message_is_signal(message, INDICATE_LISTENER_DBUS_IFACE, "IndicatorServersReport")) {
287 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
288 }
289

Subscribers

People subscribed via source and target branches

to all changes: