diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.h | 2 | ||||
| -rw-r--r-- | libdbusmenu-gtk/client.c | 13 | ||||
| -rw-r--r-- | tests/test-gtk-label.json | 4 |
8 files changed, 45 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index f391354..7f6c776 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.2.7, ted@canonical.com) +AC_INIT(libdbusmenu, 0.2.8, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.2.7, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.2.8, [-Wno-portability]) AM_MAINTAINER_MODE @@ -78,7 +78,7 @@ AC_PATH_PROG([VALA_API_GEN], [vapigen]) ########################### LIBDBUSMENU_CURRENT=1 -LIBDBUSMENU_REVISION=4 +LIBDBUSMENU_REVISION=5 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) diff --git a/debian/changelog b/debian/changelog index 68ec49f..5baf923 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +libdbusmenu (0.2.8-0ubuntu1) lucid; urgency=low + + * debian/control + - Dropped Vcs-Bzr and Vcs-Browser + - Added extended descriptio for gir1.0-dbusmenu-gtk-0.2 and + gir1.0-dbusmenu-glib-0.2 + + * debian/rules + - bumped shlibs version to 0.2.8 for libdbusmenu-glib1 + + [Ted Gould] + * Upstream release 0.2.8 + * Adding support for blank icons (LP: #534854) + * Remove unneeded warning (LP: #537312) + * Fix typo in documentation + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 25 Mar 2010 11:35:46 -0400 + libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low * Upstream release 0.2.7 diff --git a/debian/control b/debian/control index cdc808d..9c6f3a2 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,6 @@ Build-Depends: debhelper (>= 5.0), valac Standards-Version: 3.8.0 Homepage: https://launchpad.net/libdbusmenu -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu Package: libdbusmenu-glib1 Section: libs @@ -73,6 +71,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + python, libdbusmenu-glib1 (= ${binary:Version}) Description: Tools useful during development with libdbusmenu . @@ -85,6 +84,9 @@ Depends: ${misc:Depends}, libdbusmenu-glib1 (= ${binary:Version}), gir1.0-glib-2.0 Description: Typelib file for libdbusmenu-glib1 + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings Package: gir1.0-dbusmenu-gtk-0.2 Section: libs @@ -94,4 +96,6 @@ Depends: ${misc:Depends}, gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), gir1.0-gtk-2.0 Description: Typelib file for libdbusmenu-gtk1 - + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings diff --git a/debian/rules b/debian/rules index 90e7af5..c23bde6 100755 --- a/debian/rules +++ b/debian/rules @@ -7,5 +7,5 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.2)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.8)' diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index a2d2682..28d3134 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -459,7 +459,7 @@ take_children_signal (gpointer data, gpointer user_data) While the name sounds devious that's exactly what this function does. It takes the list of children from the @mi and clears the - internal list. The calling function is no in charge of the ref's + internal list. The calling function is now in charge of the ref's on the children it has taken. A lot of responsibility involved in taking children. diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index 1382335..04fd911 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -66,6 +66,8 @@ G_BEGIN_DECLS #define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED 1 #define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN -1 +#define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon" + /** DbusmenuMenuitem: diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 781326e..98f1cb2 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -411,7 +411,6 @@ dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem * gpointer data = g_object_get_data(G_OBJECT(item), data_menuitem); if (data == NULL) { - g_warning("GTK not updated"); return NULL; } @@ -513,7 +512,7 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GV if (!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA)) { /* If we have an image already built from a name that is way better than a pixbuf. Keep it. */ - if (gtkimage != NULL && gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) == GTK_IMAGE_ICON_NAME) { + 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)) { return; } } @@ -525,6 +524,8 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GV /* If there is no name, by golly we want no icon either. */ gtkimage = NULL; + } else if (g_strcmp0(iconname, DBUSMENU_MENUITEM_ICON_NAME_BLANK) == 0) { + gtkimage = gtk_image_new(); } else { /* Look to see if we want to have an icon with the 'ltr' or 'rtl' depending on what we're doing. */ @@ -584,6 +585,14 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GV } + if (gtkimage != NULL) { + gint width, height; + gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); + + gtk_widget_set_size_request(GTK_WIDGET(gtkimage), width, height); + gtk_misc_set_alignment(GTK_MISC(gtkimage), 0.0, 0.5); + } + genericmenuitem_set_image(GENERICMENUITEM(gimi), gtkimage); return; diff --git a/tests/test-gtk-label.json b/tests/test-gtk-label.json index 973ab7b..755bd44 100644 --- a/tests/test-gtk-label.json +++ b/tests/test-gtk-label.json @@ -242,8 +242,8 @@ "label": "sad"}, {"id": 89, "type": "standard", - "icon-name": "face-sick", - "label": "sick"} + "icon-name": "blank-icon", + "label": "blank"} ] }, {"id": 9, "type": "standard", |