From: Dana Jansens <danakj@orodu.net>
Date: Tue, 5 Jun 2007 16:48:11 +0000 (+0000)
Subject: merge 7374-75 from trunk
X-Git-Tag: release-3.4.3~102
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=bd95ad32ecb804e230bb877cd00f361ebf557c44;p=dana%2Fopenbox.git

merge 7374-75 from trunk
---

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 218e251a..51f2cff9 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -330,6 +330,7 @@ void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
     popup = popup_new(FALSE);
+    popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 
     if (!reconfig)
         client_add_destroy_notify(keyboard_interactive_end_client, NULL);
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 38dab22d..232cc9b9 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -68,6 +68,7 @@ static void client_dest(ObClient *client, gpointer data)
 void moveresize_startup(gboolean reconfig)
 {
     popup = popup_new(FALSE);
+    popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 
     if (!reconfig)
         client_add_destroy_notify(client_dest, NULL);
diff --git a/openbox/popup.c b/openbox/popup.c
index 8fad26b4..2fb275ca 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -185,6 +185,7 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     if (self->textw)
         textw = self->textw;
+    else
 
     iconx = textx = l + ob_rr_theme->paddingx;