Merge lp:~dbusmenu-team/libdbusmenu/ubuntu-0-1 into lp:~ubuntu-desktop/libdbusmenu/ubuntu

Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu-0-1
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 315 lines (+98/-14)
9 files modified
.bzrignore (+2/-0)
configure.ac (+3/-3)
debian/changelog (+16/-0)
libdbusmenu-glib/client.c (+5/-5)
libdbusmenu-glib/dbus-menu.xml (+58/-1)
libdbusmenu-glib/server.c (+3/-3)
libdbusmenu-gtk/client.c (+2/-0)
libdbusmenu-gtk/client.h (+1/-2)
libdbusmenu-gtk/menu.c (+8/-0)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu-0-1
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+15975@code.launchpad.net
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
=== modified file '.bzrignore'
--- .bzrignore 2009-10-01 15:21:18 +0000
+++ .bzrignore 2009-12-10 19:00:34 +0000
@@ -49,3 +49,5 @@
49tests/test-gtk-reorder-server.c49tests/test-gtk-reorder-server.c
50tests/test-gtk-reorder-server50tests/test-gtk-reorder-server
51tests/test-gtk-reorder51tests/test-gtk-reorder
52libdbusmenu-[0-9].[0-9].[0-9].tar.gz
53libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc
5254
=== modified file 'configure.ac'
--- configure.ac 2009-10-02 21:51:10 +0000
+++ configure.ac 2009-12-10 19:00:34 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.1.6, ted@canonical.com)2AC_INIT(libdbusmenu, 0.1.8, ted@canonical.com)
3AC_COPYRIGHT([Copyright 2009 Canonical])3AC_COPYRIGHT([Copyright 2009 Canonical])
44
5AC_PREREQ(2.53)5AC_PREREQ(2.53)
66
7AM_CONFIG_HEADER(config.h)7AM_CONFIG_HEADER(config.h)
8AM_INIT_AUTOMAKE(libdbusmenu, 0.1.6)8AM_INIT_AUTOMAKE(libdbusmenu, 0.1.8)
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -66,7 +66,7 @@
66###########################66###########################
6767
68LIBDBUSMENU_CURRENT=068LIBDBUSMENU_CURRENT=0
69LIBDBUSMENU_REVISION=669LIBDBUSMENU_REVISION=8
70LIBDBUSMENU_AGE=070LIBDBUSMENU_AGE=0
7171
72AC_SUBST(LIBDBUSMENU_CURRENT)72AC_SUBST(LIBDBUSMENU_CURRENT)
7373
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-05 15:06:58 +0000
+++ debian/changelog 2009-12-10 19:00:34 +0000
@@ -1,3 +1,19 @@
1libdbusmenu (0.1.8-0ubuntu1~ppa1) karmic; urgency=low
2
3 * Upstream release 0.1.8
4 * Changing the name to org.ayatana
5 * Underline fixes
6 * Documenation of the DBus API
7
8 -- Ted Gould <ted@ubuntu.com> Thu, 10 Dec 2009 12:55:07 -0600
9
10libdbusmenu (0.1.7-0ubuntu1~ppa1) karmic; urgency=low
11
12 * Upstream release 0.1.7
13 * Adding the GPL v3 Copying file so that we're all legal.
14
15 -- Ted Gould <ted@ubuntu.com> Mon, 05 Oct 2009 11:32:05 -0400
16
1libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low17libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low
218
3 * Upstream release 0.1.6 (LP: #442822)19 * Upstream release 0.1.6 (LP: #442822)
420
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2009-10-02 21:31:22 +0000
+++ libdbusmenu-glib/client.c 2009-12-10 19:00:34 +0000
@@ -351,7 +351,7 @@
351 DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id);351 DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id);
352 g_return_if_fail(menuitem != NULL);352 g_return_if_fail(menuitem != NULL);
353353
354 org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);354 org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
355 return;355 return;
356}356}
357357
@@ -472,7 +472,7 @@
472 priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,472 priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
473 priv->dbus_name,473 priv->dbus_name,
474 priv->dbus_object,474 priv->dbus_object,
475 "org.freedesktop.dbusmenu",475 "org.ayatana.dbusmenu",
476 &error);476 &error);
477 if (error != NULL) {477 if (error != NULL) {
478 g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);478 g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
@@ -647,7 +647,7 @@
647menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client)647menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client)
648{648{
649 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);649 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
650 org_freedesktop_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);650 org_ayatana_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
651 return;651 return;
652}652}
653653
@@ -689,7 +689,7 @@
689 propdata->item = item;689 propdata->item = item;
690 propdata->parent = parent;690 propdata->parent = parent;
691691
692 org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);692 org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
693 } else {693 } else {
694 g_warning("Unable to allocate memory to get properties for menuitem. This menuitem will never be realized.");694 g_warning("Unable to allocate memory to get properties for menuitem. This menuitem will never be realized.");
695 }695 }
@@ -829,7 +829,7 @@
829 update_layout_cb,829 update_layout_cb,
830 client,830 client,
831 NULL,831 NULL,
832 G_TYPE_STRING, "org.freedesktop.dbusmenu",832 G_TYPE_STRING, "org.ayatana.dbusmenu",
833 G_TYPE_STRING, "layout",833 G_TYPE_STRING, "layout",
834 G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID);834 G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID);
835835
836836
=== modified file 'libdbusmenu-glib/dbus-menu.xml'
--- libdbusmenu-glib/dbus-menu.xml 2009-09-21 20:20:45 +0000
+++ libdbusmenu-glib/dbus-menu.xml 2009-12-10 19:00:34 +0000
@@ -28,34 +28,91 @@
28<http://www.gnu.org/licenses/>28<http://www.gnu.org/licenses/>
29-->29-->
30<node name="/">30<node name="/">
31 <interface name="org.freedesktop.dbusmenu">31 <interface name="org.ayatana.dbusmenu">
3232
33<!-- Properties -->33<!-- Properties -->
34<!--
35Provides an XML representation of the menu hierarchy
36
37XML syntax:
38
39<menu id="1" revision="2"> # Root container
40 <menu id="2" revision="2"> # First level menu, for example "File"
41 <menu id="3" revision="2"/> ~ Second level menu, for example "Open"
42 <menu id="4" revision="3"/>
43 ...
44 </menu>
45 <menu id="5" revision="2"> # Another first level menu, say "Edit"
46 ...
47 </menu>
48 ...
49</menu>
50-->
34 <property name="layout" type="s" access="read"/>51 <property name="layout" type="s" access="read"/>
3552
36<!-- Functions -->53<!-- Functions -->
54
55<!--
56Each menu item has a set of properties. Property keys are in menuitem.h:
57
58- visible
59- sensitive
60- label
61- icon
62- icon-data
63- type
64
65"type" property is an enum which can take the following values (client.h):
66
67- menuitem
68- separator
69- imageitem
70-->
37 <method name="GetProperty">71 <method name="GetProperty">
38 <arg type="u" name="id" direction="in" />72 <arg type="u" name="id" direction="in" />
39 <arg type="s" name="property" direction="in" />73 <arg type="s" name="property" direction="in" />
40 <arg type="s" name="value" direction="out" />74 <arg type="s" name="value" direction="out" />
41 </method>75 </method>
76
77<!--
78Convenience method to retrieve all properties in one call (more efficient)
79-->
42 <method name="GetProperties">80 <method name="GetProperties">
43 <arg type="u" name="id" direction="in" />81 <arg type="u" name="id" direction="in" />
44 <arg type="a{ss}" name="properties" direction="out" />82 <arg type="a{ss}" name="properties" direction="out" />
45 </method>83 </method>
84
85<!--
86This is called by the display to notify the application it should trigger
87the action associated with a specific menu id
88-->
46 <method name="Call">89 <method name="Call">
47 <arg type="u" name="id" direction="in" />90 <arg type="u" name="id" direction="in" />
48 </method>91 </method>
4992
50<!-- Signals -->93<!-- Signals -->
94<!--
95Triggered by the application to notify display that the property prop from menu id
96as changed to value.
97-->
51 <signal name="IdPropUpdate">98 <signal name="IdPropUpdate">
52 <arg type="u" name="id" direction="out" />99 <arg type="u" name="id" direction="out" />
53 <arg type="s" name="prop" direction="out" />100 <arg type="s" name="prop" direction="out" />
54 <arg type="s" name="value" direction="out" />101 <arg type="s" name="value" direction="out" />
55 </signal>102 </signal>
103
104<!--
105Triggered by the application to notify display that all properties of menu id
106should be considered outdated
107-->
56 <signal name="IdUpdate">108 <signal name="IdUpdate">
57 <arg type="u" name="id" direction="out" />109 <arg type="u" name="id" direction="out" />
58 </signal>110 </signal>
111
112<!--
113Triggered by the application to notify display of a layout update, up to
114revision
115-->
59 <signal name="LayoutUpdate">116 <signal name="LayoutUpdate">
60 <arg type="i" name="revision" direction="out" />117 <arg type="i" name="revision" direction="out" />
61 </signal>118 </signal>
62119
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c 2009-09-21 20:01:40 +0000
+++ libdbusmenu-glib/server.c 2009-12-10 19:00:34 +0000
@@ -161,7 +161,7 @@
161 g_object_class_install_property (object_class, PROP_DBUS_OBJECT,161 g_object_class_install_property (object_class, PROP_DBUS_OBJECT,
162 g_param_spec_string(DBUSMENU_SERVER_PROP_DBUS_OBJECT, "DBus object path",162 g_param_spec_string(DBUSMENU_SERVER_PROP_DBUS_OBJECT, "DBus object path",
163 "The object that represents this set of menus on DBus",163 "The object that represents this set of menus on DBus",
164 "/org/freedesktop/dbusmenu",164 "/org/ayatana/dbusmenu",
165 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));165 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
166 g_object_class_install_property (object_class, PROP_ROOT_NODE,166 g_object_class_install_property (object_class, PROP_ROOT_NODE,
167 g_param_spec_object(DBUSMENU_SERVER_PROP_ROOT_NODE, "Root menu node",167 g_param_spec_object(DBUSMENU_SERVER_PROP_ROOT_NODE, "Root menu node",
@@ -472,7 +472,7 @@
472472
473 Creates a new #DbusmenuServer object with a specific object473 Creates a new #DbusmenuServer object with a specific object
474 path on DBus. If @object is set to NULL the default object474 path on DBus. If @object is set to NULL the default object
475 name of "/org/freedesktop/dbusmenu" will be used.475 name of "/org/ayatana/dbusmenu" will be used.
476476
477 Return value: A brand new #DbusmenuServer477 Return value: A brand new #DbusmenuServer
478*/478*/
@@ -480,7 +480,7 @@
480dbusmenu_server_new (const gchar * object)480dbusmenu_server_new (const gchar * object)
481{481{
482 if (object == NULL) {482 if (object == NULL) {
483 object = "/org/freedesktop/dbusmenu";483 object = "/org/ayatana/dbusmenu";
484 }484 }
485485
486 DbusmenuServer * self = g_object_new(DBUSMENU_TYPE_SERVER,486 DbusmenuServer * self = g_object_new(DBUSMENU_TYPE_SERVER,
487487
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c 2009-10-02 20:01:16 +0000
+++ libdbusmenu-gtk/client.c 2009-12-10 19:00:34 +0000
@@ -359,6 +359,7 @@
359359
360 GtkMenuItem * gmi;360 GtkMenuItem * gmi;
361 gmi = GTK_MENU_ITEM(gtk_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL)));361 gmi = GTK_MENU_ITEM(gtk_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL)));
362 gtk_menu_item_set_use_underline (gmi, TRUE);
362363
363 if (gmi != NULL) {364 if (gmi != NULL) {
364 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);365 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
@@ -489,6 +490,7 @@
489490
490 GtkMenuItem * gmi;491 GtkMenuItem * gmi;
491 gmi = GTK_MENU_ITEM(gtk_image_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL)));492 gmi = GTK_MENU_ITEM(gtk_image_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL)));
493 gtk_menu_item_set_use_underline (gmi, TRUE);
492494
493 if (gmi != NULL) {495 if (gmi != NULL) {
494 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);496 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
495497
=== modified file 'libdbusmenu-gtk/client.h'
--- libdbusmenu-gtk/client.h 2009-08-26 21:58:46 +0000
+++ libdbusmenu-gtk/client.h 2009-12-10 19:00:34 +0000
@@ -29,8 +29,7 @@
29#ifndef __DBUSMENU_GTKCLIENT_H__29#ifndef __DBUSMENU_GTKCLIENT_H__
30#define __DBUSMENU_GTKCLIENT_H__30#define __DBUSMENU_GTKCLIENT_H__
3131
32#include <glib.h>32#include <gtk/gtk.h>
33#include <glib-object.h>
34#include <libdbusmenu-glib/client.h>33#include <libdbusmenu-glib/client.h>
3534
36G_BEGIN_DECLS35G_BEGIN_DECLS
3736
=== modified file 'libdbusmenu-gtk/menu.c'
--- libdbusmenu-gtk/menu.c 2009-10-02 01:44:05 +0000
+++ libdbusmenu-gtk/menu.c 2009-12-10 19:00:34 +0000
@@ -213,7 +213,9 @@
213static void213static void
214root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, DbusmenuGtkMenu * menu)214root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, DbusmenuGtkMenu * menu)
215{215{
216 #ifdef MASSIVEDEBUGGING
216 g_debug("Root new child");217 g_debug("Root new child");
218 #endif
217 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);219 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);
218220
219 g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), menu);221 g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), menu);
@@ -240,7 +242,9 @@
240static void242static void
241root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newposition, guint oldposition, DbusmenuGtkMenu * menu)243root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newposition, guint oldposition, DbusmenuGtkMenu * menu)
242{244{
245 #ifdef MASSIVEDEBUGGING
243 g_debug("Root child moved");246 g_debug("Root child moved");
247 #endif
244 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);248 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);
245 gtk_menu_reorder_child(GTK_MENU(menu), GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)), newposition);249 gtk_menu_reorder_child(GTK_MENU(menu), GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)), newposition);
246 return;250 return;
@@ -250,7 +254,9 @@
250static void254static void
251root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGtkMenu * menu)255root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGtkMenu * menu)
252{256{
257 #ifdef MASSIVEDEBUGGING
253 g_debug("Root child deleted");258 g_debug("Root child deleted");
259 #endif
254 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);260 DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu);
255 GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child));261 GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child));
256 if (item != NULL) {262 if (item != NULL) {
@@ -268,7 +274,9 @@
268static void274static void
269child_realized (DbusmenuMenuitem * child, gpointer userdata)275child_realized (DbusmenuMenuitem * child, gpointer userdata)
270{276{
277 #ifdef MASSIVEDEBUGGING
271 g_debug("Root child realized");278 g_debug("Root child realized");
279 #endif
272 g_return_if_fail(DBUSMENU_IS_GTKMENU(userdata));280 g_return_if_fail(DBUSMENU_IS_GTKMENU(userdata));
273281
274 DbusmenuGtkMenu * menu = DBUSMENU_GTKMENU(userdata);282 DbusmenuGtkMenu * menu = DBUSMENU_GTKMENU(userdata);

Subscribers

People subscribed via source and target branches

to all changes: