| blob | 1f8523203d61368d345a86e0f480ece2c7636119 |
1 From 0098a2636c9571585edd6e684a89cf4408ffd1bf Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Jos=C3=A9=20Valent=C3=ADn=20Guti=C3=A9rrez=20Boquete?= <jv.gutierrezb@gmail.com>
3 Date: Sat, 11 Dec 2010 19:57:57 +0100
4 Subject: [PATCH 1/2] Migrate from libonobo to D-BUS
6 ---
7 GNOME_NetspeedApplet.server.in.in | 32 ----------
8 Makefile.am | 43 +++++++++----
9 configure.in | 2 +-
10 org.gnome.panel.Netspeed.panel-applet.in.in | 11 +++
11 ...e.panel.applet.NetspeedAppletFactory.service.in | 3 +
12 src/netspeed.c | 66 ++++++++++----------
13 6 files changed, 79 insertions(+), 78 deletions(-)
14 delete mode 100644 GNOME_NetspeedApplet.server.in.in
15 create mode 100644 org.gnome.panel.Netspeed.panel-applet.in.in
16 create mode 100644 org.gnome.panel.applet.NetspeedAppletFactory.service.in
18 Index: netspeed_applet-0.16/GNOME_NetspeedApplet.server.in.in
19 ===================================================================
20 --- netspeed_applet-0.16.orig/GNOME_NetspeedApplet.server.in.in 2010-06-05 12:52:51.000000000 +0200
21 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
22 @@ -1,32 +0,0 @@
23 -<oaf_info>
24 -
25 -<oaf_server iid="OAFIID:GNOME_NetspeedApplet_Factory"
26 - type="exe"
27 - location="@LIBEXECDIR@/netspeed_applet2">
28 -
29 - <oaf_attribute name="repo_ids" type="stringv">
30 - <item value="IDL:Bonobo/GenericFactory:1.0"/>
31 - <item value="IDL:Bonobo/Unknown:1.0"/>
32 - </oaf_attribute>
33 - <oaf_attribute name="name" type="string" _value="Netspeed Applet Factory"/>
34 - <oaf_attribute name="description" type="string" _value="Netspeed Applet"/>
35 -
36 -</oaf_server>
37 -
38 -<oaf_server iid="OAFIID:GNOME_NetspeedApplet"
39 - type="factory"
40 - location="OAFIID:GNOME_NetspeedApplet_Factory">
41 -
42 - <oaf_attribute name="repo_ids" type="stringv">
43 - <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
44 - <item value="IDL:Bonobo/Control:1.0"/>
45 - <item value="IDL:Bonobo/Unknown:1.0"/>
46 - </oaf_attribute>
47 - <oaf_attribute name="name" type="string" _value="Network Monitor"/>
48 - <oaf_attribute name="description" type="string" _value="Netspeed Applet"/>
49 - <oaf_attribute name="panel:category" type="string" _value="Internet"/>
50 - <oaf_attribute name="panel:icon" type="string" value="netspeed-applet.png"/>
51 -
52 -</oaf_server>
53 -
54 -</oaf_info>
55 Index: netspeed_applet-0.16/Makefile.am
56 ===================================================================
57 --- netspeed_applet-0.16.orig/Makefile.am 2010-06-05 12:52:51.000000000 +0200
58 +++ netspeed_applet-0.16/Makefile.am 2011-04-11 01:47:57.578175782 +0200
59 @@ -1,32 +1,49 @@
60 SUBDIRS = help icons po src
62 -serverdir = $(libdir)/bonobo/servers
63 -server_DATA = GNOME_NetspeedApplet.server
64 -server_in_files = $(server_DATA:=.in)
65 -server_in_in_files = $(server_in_files:=.in)
66 -@INTLTOOL_SERVER_RULE@
67 +appletdir = $(datadir)/gnome-panel/applets
68 +applet_in_files = org.gnome.panel.Netspeed.panel-applet.in
69 +applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
70 +
71 +$(applet_in_files): $(applet_in_files).in Makefile
72 + $(AM_V_GEN)sed \
73 + -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
74 + -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
75 + $< > $@
76 +
77 +%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
78 +
79 +servicedir = $(datadir)/dbus-1/services
80 +service_in_files = org.gnome.panel.applet.NetspeedAppletFactory.service.in
81 +service_DATA = $(service_in_files:.service.in=.service)
82 +
83 +org.gnome.panel.applet.NetspeedAppletFactory.service: $(service_in_files)
84 + $(AM_V_GEN)sed \
85 + -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
86 + $< > $@
87 +
88 +@INTLTOOL_SERVICE_RULE@
90 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
92 spec = $(PACKAGE).spec
93 -EXTRA_DIST = GNOME_NetspeedApplet.server.in.in \
94 +EXTRA_DIST = org.gnome.panel.Netspeed.panel-applet.in.in \
95 + $(service_in_files) \
96 $(spec) \
97 gnome-doc-utils.make \
98 intltool-update.in \
99 intltool-merge.in \
100 intltool-extract.in
102 -all-local: $(spec) $(server_DATA)
103 -
104 -$(server_in_files): $(server_in_in_files) Makefile
105 - sed s,@LIBEXECDIR@,$(libexecdir),g <$< >$@
106 +all-local: $(spec) $(service_DATA)
108 -CLEANFILES = $(server_DATA)
109 +CLEANFILES = \
110 + $(applet_DATA) \
111 + $(applet_DATA).in \
112 + $(service_DATA)
113 DISTCLEANFILES = \
114 gnome-doc-utils.make \
115 intltool-extract \
116 intltool-merge \
117 - intltool-update \
118 - $(server_in_files)
119 + intltool-update
121 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
122 Index: netspeed_applet-0.16/configure.in
123 ===================================================================
124 --- netspeed_applet-0.16.orig/configure.in 2010-06-05 16:33:01.000000000 +0200
125 +++ netspeed_applet-0.16/configure.in 2011-04-11 01:47:57.546175627 +0200
126 @@ -20,7 +20,7 @@ GETTEXT_PACKAGE=netspeed_applet
127 AC_SUBST(GETTEXT_PACKAGE)
128 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", GETTEXT_PACKAGE)
130 -PKG_CHECK_MODULES(NETSPEED, libpanelapplet-2.0 libgtop-2.0 >= 2.14.2)
131 +PKG_CHECK_MODULES(NETSPEED, libpanelapplet-3.0 >= 2.32 libgtop-2.0 >= 2.14.2)
133 AC_SUBST(NETSPEED_APPLET_CFLAGS)
134 AC_SUBST(NETSPEED_APPLET_LIBS)
135 Index: netspeed_applet-0.16/org.gnome.panel.Netspeed.panel-applet.in.in
136 ===================================================================
137 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
138 +++ netspeed_applet-0.16/org.gnome.panel.Netspeed.panel-applet.in.in 2011-04-11 01:35:45.806598334 +0200
139 @@ -0,0 +1,11 @@
140 +[Applet Factory]
141 +Id=NetspeedAppletFactory
142 +Location=@LIBEXECDIR@/netspeed_applet2
143 +_Name=Netspeed Applet Factory
144 +_Description=Netspeed Applet
145 +
146 +[NetspeedApplet]
147 +_Name=Network Monitor
148 +_Description=Netspeed Applet
149 +Icon=netspeed-applet
150 +BonoboId=OAFIID:GNOME_NetspeedApplet
151 Index: netspeed_applet-0.16/org.gnome.panel.applet.NetspeedAppletFactory.service.in
152 ===================================================================
153 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
154 +++ netspeed_applet-0.16/org.gnome.panel.applet.NetspeedAppletFactory.service.in 2011-04-11 01:35:45.806598334 +0200
155 @@ -0,0 +1,3 @@
156 +[D-BUS Service]
157 +Name=org.gnome.panel.applet.NetspeedAppletFactory
158 +Exec=@LIBEXECDIR@/netspeed_applet2
159 Index: netspeed_applet-0.16/src/netspeed.c
160 ===================================================================
161 --- netspeed_applet-0.16.orig/src/netspeed.c 2011-04-11 01:35:45.002594409 +0200
162 +++ netspeed_applet-0.16/src/netspeed.c 2011-04-11 01:48:51.842441070 +0200
163 @@ -24,6 +24,7 @@
165 #include <math.h>
166 #include <gtk/gtk.h>
167 +#include <glib/gi18n.h>
168 #include <panel-applet.h>
169 #include <panel-applet-gconf.h>
170 #include <gconf/gconf-client.h>
171 @@ -105,17 +106,11 @@ typedef struct
173 static const char
174 netspeed_applet_menu_xml [] =
175 - "<popup name=\"button3\">\n"
176 - " <menuitem name=\"Properties Item\" verb=\"NetspeedAppletDetails\" label=\"%s\"\n"
177 - " pixtype=\"stock\" pixname=\"gtk-info\"/>\n"
178 - " <separator/>\n"
179 - " <menuitem name=\"Properties Item\" verb=\"NetspeedAppletProperties\" label=\"%s\"\n"
180 - " pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
181 - " <menuitem name=\"Help Item\" verb=\"NetspeedAppletHelp\" label=\"%s\"\n"
182 - " pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
183 - " <menuitem name=\"About Item\" verb=\"NetspeedAppletAbout\" label=\"%s\"\n"
184 - " pixtype=\"stock\" pixname=\"gtk-about\"/>\n"
185 - "</popup>\n";
186 + "<menuitem name=\"Details Item\" action=\"NetspeedAppletDetails\" />\n"
187 + "<separator/>\n"
188 + "<menuitem name=\"Properties Item\" action=\"NetspeedAppletProperties\" />\n"
189 + "<menuitem name=\"Help Item\" action=\"NetspeedAppletHelp\" />\n"
190 + "<menuitem name=\"About Item\" action=\"NetspeedAppletAbout\" />\n";
193 static void
194 @@ -769,7 +764,7 @@ display_help (GtkWidget *dialog, const g
195 /* Opens gnome help application
196 */
197 static void
198 -help_cb (BonoboUIComponent *uic, NetspeedApplet *ap, const gchar *verbname)
199 +help_cb (GtkAction *action, NetspeedApplet *ap)
200 {
201 display_help (GTK_WIDGET (ap->applet), NULL);
202 }
203 @@ -816,7 +811,7 @@ handle_links (GtkAboutDialog *about, con
204 /* Just the about window... If it's already open, just fokus it
205 */
206 static void
207 -about_cb(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
208 +about_cb(GtkAction *action, gpointer data)
209 {
210 const char *authors[] =
211 {
212 @@ -935,7 +930,7 @@ changeicon_change_cb(GtkToggleButton *to
213 * them in the gconf database
214 */
215 static void
216 -settings_cb(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
217 +settings_cb(GtkAction *action, gpointer data)
218 {
219 NetspeedApplet *applet = (NetspeedApplet*)data;
220 GtkWidget *vbox;
221 @@ -1132,7 +1127,7 @@ info_response_cb (GtkDialog *dialog, gin
222 /* Creates the details dialog
223 */
224 static void
225 -showinfo_cb(BonoboUIComponent *uic, gpointer data, const gchar *verbname)
226 +showinfo_cb(GtkAction *action, gpointer data)
227 {
228 NetspeedApplet *applet = (NetspeedApplet*)data;
229 GtkWidget *box, *hbox;
230 @@ -1317,15 +1312,17 @@ showinfo_cb(BonoboUIComponent *uic, gpoi
231 gtk_widget_show_all(GTK_WIDGET(applet->details));
232 }
234 -static const BonoboUIVerb
235 -netspeed_applet_menu_verbs [] =
236 +static const GtkActionEntry
237 +netspeed_applet_menu_actions [] =
238 {
239 - BONOBO_UI_VERB("NetspeedAppletDetails", showinfo_cb),
240 - BONOBO_UI_VERB("NetspeedAppletProperties", settings_cb),
241 - BONOBO_UI_UNSAFE_VERB("NetspeedAppletHelp", help_cb),
242 - BONOBO_UI_VERB("NetspeedAppletAbout", about_cb),
243 -
244 - BONOBO_UI_VERB_END
245 + { "NetspeedAppletDetails", GTK_STOCK_INFO, N_("Device _Details"),
246 + NULL, NULL, G_CALLBACK(showinfo_cb) },
247 + { "NetspeedAppletProperties", GTK_STOCK_PROPERTIES, N_("_Preferences..."),
248 + NULL, NULL, G_CALLBACK(settings_cb) },
249 + { "NetspeedAppletHelp", GTK_STOCK_HELP, N_("_Help"),
250 + NULL, NULL, G_CALLBACK(help_cb) },
251 + { "NetspeedAppletAbout", GTK_STOCK_ABOUT, N_("_About..."),
252 + NULL, NULL, G_CALLBACK(about_cb) }
253 };
255 /* Block the size_request signal emit by the label if the
256 @@ -1514,11 +1511,11 @@ netspeed_applet_factory(PanelApplet *app
257 {
258 NetspeedApplet *applet;
259 int i;
260 - char* menu_string;
261 GtkIconTheme *icon_theme;
262 GtkWidget *spacer, *spacer_box;
263 + GtkActionGroup *action_group;
265 - if (strcmp (iid, "OAFIID:GNOME_NetspeedApplet"))
266 + if (strcmp (iid, "NetspeedApplet"))
267 return FALSE;
269 glibtop_init();
270 @@ -1690,14 +1687,19 @@ netspeed_applet_factory(PanelApplet *app
271 (gpointer)applet);
274 - menu_string = g_strdup_printf(netspeed_applet_menu_xml, _("Device _Details"), _("_Preferences..."), _("_Help"), _("_About..."));
275 - panel_applet_setup_menu(applet_widget, menu_string,
276 - netspeed_applet_menu_verbs,
277 - (gpointer)applet);
278 - g_free(menu_string);
279 + action_group = gtk_action_group_new("Netspeed Applet Actions");
280 + gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE);
281 + gtk_action_group_add_actions(action_group, netspeed_applet_menu_actions,
282 + G_N_ELEMENTS(netspeed_applet_menu_actions),
283 + (gpointer)applet);
284 + panel_applet_setup_menu(applet_widget,
285 + netspeed_applet_menu_xml,
286 + action_group);
287 + g_object_unref(action_group);
288 +
290 return TRUE;
291 }
293 -PANEL_APPLET_BONOBO_FACTORY("OAFIID:GNOME_NetspeedApplet_Factory", PANEL_TYPE_APPLET,
294 - PACKAGE, VERSION, (PanelAppletFactoryCallback)netspeed_applet_factory, NULL)
295 +PANEL_APPLET_OUT_PROCESS_FACTORY("NetspeedAppletFactory", PANEL_TYPE_APPLET,
296 + (PanelAppletFactoryCallback)netspeed_applet_factory, NULL)