aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-11 12:47:11 -0600
committerTed Gould <ted@gould.cx>2010-01-11 12:47:11 -0600
commit970db778792cd0c1ccae2506f701781946028870 (patch)
tree9518158144c1b7ebc8abe614c168a6f40b6c10bf
parent95c320b4d0c411737d0298914498916cca01f553 (diff)
parenteb17be92dbd586aef4f185d2e0c5af2ff6485c1b (diff)
downloadlibdbusmenu-970db778792cd0c1ccae2506f701781946028870.tar.gz
libdbusmenu-970db778792cd0c1ccae2506f701781946028870.tar.bz2
libdbusmenu-970db778792cd0c1ccae2506f701781946028870.zip
* Upstream update
* Setting direction based on parent widget text direction.
-rw-r--r--debian/changelog7
-rw-r--r--libdbusmenu-gtk/client.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 870b7d7..81fae7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.2.0-0ubuntu2~ppa1~ltr2) UNRELEASED; urgency=low
+
+ * Upstream update
+ * Setting direction based on parent widget text direction.
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 11 Jan 2010 12:46:46 -0600
+
libdbusmenu (0.2.0-0ubuntu2~ppa1~ltr1) karmic; urgency=low
* Upstream update
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 319083c..dd94663 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -513,7 +513,8 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GV
} 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, "ltr");
+ 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. */