aboutsummaryrefslogtreecommitdiff
path: root/src/idoscalemenuitem.c
diff options
context:
space:
mode:
authorCody Russell <crussell@canonical.com>2010-02-11 17:21:14 -0600
committerCody Russell <crussell@canonical.com>2010-02-11 17:21:14 -0600
commitad50ecd5bb91cb6cb0c45e82fd1d88e3ab233a36 (patch)
tree2b0202abea8f6a3ddf7f560d2ad9e7945fd3fc42 /src/idoscalemenuitem.c
parentcf57f2279875e3f3aac23074323bce02bed05f4b (diff)
parent1841df081dc9dc37b8d40ec46a35ce767bb5ce96 (diff)
downloadayatana-ido-ad50ecd5bb91cb6cb0c45e82fd1d88e3ab233a36.tar.gz
ayatana-ido-ad50ecd5bb91cb6cb0c45e82fd1d88e3ab233a36.tar.bz2
ayatana-ido-ad50ecd5bb91cb6cb0c45e82fd1d88e3ab233a36.zip
merge in secondary_padding branch from ken-vandine
Diffstat (limited to 'src/idoscalemenuitem.c')
-rw-r--r--src/idoscalemenuitem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c
index a08f2fc..668a8b1 100644
--- a/src/idoscalemenuitem.c
+++ b/src/idoscalemenuitem.c
@@ -116,7 +116,7 @@ ido_scale_menu_item_size_allocate (GtkWidget *widget,
NULL);
primary_padding = GTK_WIDGET_VISIBLE (priv->primary_image) ? primary_image_req.width : 0;
- secondary_padding += GTK_WIDGET_VISIBLE (priv->secondary_image) ? secondary_image_req.width : 0;
+ secondary_padding = GTK_WIDGET_VISIBLE (priv->secondary_image) ? secondary_image_req.width : 0;
priv->left_padding = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? primary_padding : secondary_padding;