merge 7374-75 from trunk

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 218e251accebbdf69476e157246abfdf9dc73a09..51f2cff9dcb6377205c15d388bb1c9e066a5268a 100644 (file)
--- 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 38dab22d07649d4a80bcac80629ba3979bf4ad15..232cc9b9716abe38d3a79138f1e969264fbe9758 100644 (file)
--- 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 8fad26b4889702eb0e8bcac64e1af958b61afa3e..2fb275cafaffe2f5737448b9ed6c75dc9a93b2ff 100644 (file)
--- 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;