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

[Ted Gould]

[Ted Gould (ted)]

0.2.1

[lp:~dbusmenu-team/libdbusmenu/ubuntu]

57. By Ken VanDine on 2010-01-12

merged 0.2.1

58. By Ken VanDine on 2010-01-12

* Upstream release 0.2.1
  - Fix to not destroy the image if we're still using it.
  - Adding code to support icon names that have an implied direction in them.
  - Fix to put a small amount of padding between the icon and the label.

59. By Ken VanDine on 2010-01-20

merged from lp:~ubuntu-desktop/dbusmenu/ubuntu

=== modified file 'configure.ac'
--- configure.ac	2010-01-08 14:41:29 +0000
+++ configure.ac	2010-01-12 14:53:12 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.2.0, [e-mail])
+AC_INIT(libdbusmenu, 0.2.1, [e-mail])
 AC_COPYRIGHT([Copyright 2009 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.2.0)
+AM_INIT_AUTOMAKE(libdbusmenu, 0.2.1)
 
 AM_MAINTAINER_MODE
 
@@ -66,7 +66,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=0
-LIBDBUSMENU_REVISION=10
+LIBDBUSMENU_REVISION=11
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-11 15:12:27 +0000
+++ debian/changelog	2010-01-12 14:53:12 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low
 
   * debian/rules:
@@ -13,6 +14,17 @@
 
  -- Ken VanDine <[e-mail]>  Sat, 09 Jan 2010 09:05:47 -0500
 
+=======
+libdbusmenu (0.2.1-0ubuntu1~ppa1) karmic; urgency=low
+
+  * Upstream release 0.2.1
+    * Not deleting images that we're still using.
+    * Adding padding between the icon and the label.
+    * Setting direction based on parent widget text direction.
+
+ -- Ted Gould <[e-mail]>  Tue, 12 Jan 2010 08:46:10 -0600
+
+>>>>>>> MERGE-SOURCE
 libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.0

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2010-01-07 16:53:27 +0000
+++ libdbusmenu-gtk/client.c	2010-01-12 14:53:12 +0000
@@ -511,13 +511,31 @@
 			   icon either. */
 			gtkimage = NULL;
 		} else {
+			/* Look to see if we want to have an icon with the 'ltr' or
+			   'rtl' depending on what we're doing. */
+			gchar * finaliconname = g_strdup_printf("%s-%s", iconname,
+						gtk_widget_get_direction(GTK_WIDGET(gimi)) == GTK_TEXT_DIR_RTL ? "rtl" : "ltr");
+			if (!gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), finaliconname)) {
+				/* If we don't have that icon, fall back to having one
+				   without the extra bits. */
+				g_free(finaliconname);
+				finaliconname = (gchar *)iconname; /* Dropping const not
+				                                      becaue we don't love it. */
+			}
+
 			/* If we don't have an image, we need to build
 			   one so that we can set the name.  Otherwise we
 			   can just convert it to this name. */
 			if (gtkimage == NULL) {
-				gtkimage = gtk_image_new_from_icon_name(iconname, GTK_ICON_SIZE_MENU);
+				gtkimage = gtk_image_new_from_icon_name(finaliconname, GTK_ICON_SIZE_MENU);
 			} else {
-				gtk_image_set_from_icon_name(GTK_IMAGE(gtkimage), iconname, GTK_ICON_SIZE_MENU);
+				gtk_image_set_from_icon_name(GTK_IMAGE(gtkimage), finaliconname, GTK_ICON_SIZE_MENU);
+			}
+
+			/* If we're using the name with extra bits, then we need
+			   to free that string. */
+			if (finaliconname != iconname) {
+				g_free(finaliconname);
 			}
 		}
 	} else {

=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2009-12-17 21:49:27 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2010-01-12 14:53:12 +0000
@@ -143,6 +143,17 @@
 	return;
 }
 
+/* A quick little function to grab the padding from the
+   style.  It should be considered for caching when
+   optimizing. */
+static gint
+get_hpadding (GtkWidget * widget)
+{
+	gint padding = 0;
+	gtk_widget_style_get(widget, "horizontal-padding", &padding, NULL);
+	return padding;
+}
+
 /* Set the label on the item */
 static void
 set_label (GtkMenuItem * menu_item, const gchar * label)
@@ -166,7 +177,7 @@
 			GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
 			g_object_ref(child);
 			gtk_container_remove(GTK_CONTAINER(menu_item), child);
-			gtk_box_pack_start(GTK_BOX(hbox), child, FALSE, FALSE, 0);
+			gtk_box_pack_start(GTK_BOX(hbox), child, FALSE, FALSE, get_hpadding(GTK_WIDGET(menu_item)));
 			gtk_container_add(GTK_CONTAINER(menu_item), hbox);
 			gtk_widget_show(hbox);
 			g_object_unref(child);
@@ -190,7 +201,7 @@
 		if (child == NULL) {
 			gtk_container_add(GTK_CONTAINER(menu_item), GTK_WIDGET(labelw));
 		} else {
-			gtk_box_pack_end(GTK_BOX(child), GTK_WIDGET(labelw), TRUE, TRUE, 0);
+			gtk_box_pack_end(GTK_BOX(child), GTK_WIDGET(labelw), TRUE, TRUE, get_hpadding(GTK_WIDGET(menu_item)));
 		}
 	} else {
 		/* Oh, just an update.  No biggie. */
@@ -383,7 +394,7 @@
 			GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
 			g_object_ref(child);
 			gtk_container_remove(GTK_CONTAINER(menu_item), child);
-			gtk_box_pack_end(GTK_BOX(hbox), child, TRUE, TRUE, 0);
+			gtk_box_pack_end(GTK_BOX(hbox), child, TRUE, TRUE, get_hpadding(GTK_WIDGET(menu_item)));
 			gtk_container_add(GTK_CONTAINER(menu_item), hbox);
 			gtk_widget_show(hbox);
 			g_object_unref(child);
@@ -393,6 +404,9 @@
 		}
 	}
 
+        if (image == (GtkWidget *)imagew)
+          return;
+
 	/* No we can see if we need to ethier replace and image or
 	   just put ourselves into the structures */
 	if (imagew != NULL) {
@@ -405,7 +419,7 @@
 		if (child == NULL) {
 			gtk_container_add(GTK_CONTAINER(menu_item), GTK_WIDGET(image));
 		} else {
-			gtk_box_pack_start(GTK_BOX(child), GTK_WIDGET(image), FALSE, FALSE, 0);
+			gtk_box_pack_start(GTK_BOX(child), GTK_WIDGET(image), FALSE, FALSE, get_hpadding(GTK_WIDGET(menu_item)));
 		}
 
 		gtk_widget_show(image);