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

Proposed by Ted Gould
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~dbusmenu-team/libdbusmenu/ubuntu
Merge into: lp:~ubuntu-desktop/libdbusmenu/ubuntu
Diff against target: 129 lines (+28/-8)
6 files modified
configure.ac (+3/-3)
debian/changelog (+9/-0)
libdbusmenu-glib/menuitem.c (+1/-1)
libdbusmenu-glib/menuitem.h (+2/-0)
libdbusmenu-gtk/client.c (+11/-2)
tests/test-gtk-label.json (+2/-2)
To merge this branch: bzr merge lp:~dbusmenu-team/libdbusmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+22144@code.launchpad.net

Description of the change

0.2.8

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Approved!

review: Approve
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Manually merged changes into lp:ubuntu/libdbusmenu (will be there after it gets sponsored)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2010-03-04 17:12:16 +0000
+++ configure.ac 2010-03-25 15:21:37 +0000
@@ -1,11 +1,11 @@
11
2AC_INIT(libdbusmenu, 0.2.7, ted@canonical.com)2AC_INIT(libdbusmenu, 0.2.8, ted@canonical.com)
3AC_COPYRIGHT([Copyright 2009,2010 Canonical])3AC_COPYRIGHT([Copyright 2009,2010 Canonical])
44
5AC_PREREQ(2.62)5AC_PREREQ(2.62)
66
7AM_CONFIG_HEADER(config.h)7AM_CONFIG_HEADER(config.h)
8AM_INIT_AUTOMAKE(libdbusmenu, 0.2.7, [-Wno-portability])8AM_INIT_AUTOMAKE(libdbusmenu, 0.2.8, [-Wno-portability])
99
10AM_MAINTAINER_MODE10AM_MAINTAINER_MODE
1111
@@ -78,7 +78,7 @@
78###########################78###########################
7979
80LIBDBUSMENU_CURRENT=180LIBDBUSMENU_CURRENT=1
81LIBDBUSMENU_REVISION=481LIBDBUSMENU_REVISION=5
82LIBDBUSMENU_AGE=082LIBDBUSMENU_AGE=0
8383
84AC_SUBST(LIBDBUSMENU_CURRENT)84AC_SUBST(LIBDBUSMENU_CURRENT)
8585
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-04 19:31:31 +0000
+++ debian/changelog 2010-03-25 15:21:37 +0000
@@ -1,3 +1,12 @@
1libdbusmenu (0.2.8-0ubuntu1~ppa1) lucid; urgency=low
2
3 * Upstream release 0.2.8
4 * Adding support for blank icons (LP: #534854)
5 * Remove unneeded warning (LP: #537312)
6 * Fix typo in documentation
7
8 -- Ted Gould <ted@ubuntu.com> Thu, 25 Mar 2010 10:12:27 -0500
9
1libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low10libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low
211
3 * Upstream release 0.2.712 * Upstream release 0.2.7
413
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2010-02-08 22:02:12 +0000
+++ libdbusmenu-glib/menuitem.c 2010-03-25 15:21:37 +0000
@@ -459,7 +459,7 @@
459459
460 While the name sounds devious that's exactly what this function460 While the name sounds devious that's exactly what this function
461 does. It takes the list of children from the @mi and clears the461 does. It takes the list of children from the @mi and clears the
462 internal list. The calling function is no in charge of the ref's462 internal list. The calling function is now in charge of the ref's
463 on the children it has taken. A lot of responsibility involved463 on the children it has taken. A lot of responsibility involved
464 in taking children.464 in taking children.
465465
466466
=== modified file 'libdbusmenu-glib/menuitem.h'
--- libdbusmenu-glib/menuitem.h 2010-02-05 18:48:48 +0000
+++ libdbusmenu-glib/menuitem.h 2010-03-25 15:21:37 +0000
@@ -66,6 +66,8 @@
66#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 166#define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1
67#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN -167#define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN -1
6868
69#define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon"
70
69/**71/**
70 DbusmenuMenuitem:72 DbusmenuMenuitem:
7173
7274
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c 2010-02-04 18:56:49 +0000
+++ libdbusmenu-gtk/client.c 2010-03-25 15:21:37 +0000
@@ -411,7 +411,6 @@
411411
412 gpointer data = g_object_get_data(G_OBJECT(item), data_menuitem);412 gpointer data = g_object_get_data(G_OBJECT(item), data_menuitem);
413 if (data == NULL) {413 if (data == NULL) {
414 g_warning("GTK not updated");
415 return NULL;414 return NULL;
416 }415 }
417416
@@ -513,7 +512,7 @@
513 if (!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA)) {512 if (!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA)) {
514 /* If we have an image already built from a name that is513 /* If we have an image already built from a name that is
515 way better than a pixbuf. Keep it. */514 way better than a pixbuf. Keep it. */
516 if (gtkimage != NULL && gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) == GTK_IMAGE_ICON_NAME) {515 if (gtkimage != NULL && (gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) == GTK_IMAGE_ICON_NAME || gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) == GTK_IMAGE_EMPTY)) {
517 return;516 return;
518 }517 }
519 }518 }
@@ -525,6 +524,8 @@
525 /* If there is no name, by golly we want no524 /* If there is no name, by golly we want no
526 icon either. */525 icon either. */
527 gtkimage = NULL;526 gtkimage = NULL;
527 } else if (g_strcmp0(iconname, DBUSMENU_MENUITEM_ICON_NAME_BLANK) == 0) {
528 gtkimage = gtk_image_new();
528 } else {529 } else {
529 /* Look to see if we want to have an icon with the 'ltr' or530 /* Look to see if we want to have an icon with the 'ltr' or
530 'rtl' depending on what we're doing. */531 'rtl' depending on what we're doing. */
@@ -584,6 +585,14 @@
584585
585 }586 }
586587
588 if (gtkimage != NULL) {
589 gint width, height;
590 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
591
592 gtk_widget_set_size_request(GTK_WIDGET(gtkimage), width, height);
593 gtk_misc_set_alignment(GTK_MISC(gtkimage), 0.0, 0.5);
594 }
595
587 genericmenuitem_set_image(GENERICMENUITEM(gimi), gtkimage);596 genericmenuitem_set_image(GENERICMENUITEM(gimi), gtkimage);
588597
589 return;598 return;
590599
=== modified file 'tests/test-gtk-label.json'
--- tests/test-gtk-label.json 2010-02-05 17:53:19 +0000
+++ tests/test-gtk-label.json 2010-03-25 15:21:37 +0000
@@ -242,8 +242,8 @@
242 "label": "sad"},242 "label": "sad"},
243 {"id": 89,243 {"id": 89,
244 "type": "standard",244 "type": "standard",
245 "icon-name": "face-sick",245 "icon-name": "blank-icon",
246 "label": "sick"}246 "label": "blank"}
247 ]247 ]
248 },248 },
249 {"id": 9, "type": "standard",249 {"id": 9, "type": "standard",

Subscribers

People subscribed via source and target branches

to all changes: