From 62e36ad0410ce888e7097e7bce5cbbf67b5b6290 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 12 Jan 2010 13:59:25 -0500 Subject: [PATCH 1/4] Fixes bug #4492 (mis-using the return value of grep -q in openbox-gnome-session script --- data/xsession/openbox-gnome-session.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in index 6765ae82..1f17edbc 100644 --- a/data/xsession/openbox-gnome-session.in +++ b/data/xsession/openbox-gnome-session.in @@ -37,7 +37,7 @@ else if test -z "$SESSION"; then # if its empty then just run openbox SESSION="[openbox]" - elif test -z $(echo "$SESSION" | grep -q openbox); then + elif echo "$SESSION" | grep -q openbox; then # if openbox isn't in the session then append it SESSION="${SESSION%]},openbox]" fi From ba747518bb400a02e43b69602d90e39dea0ea9a3 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 14 Jan 2010 14:57:18 -0500 Subject: [PATCH 2/4] don't resize the label to 0 --- openbox/frame.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openbox/frame.c b/openbox/frame.c index 20697d32..67adb405 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -862,10 +862,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved, if (focus_cycle_target == self->client) focus_cycle_update_indicator(self->client); } - if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR)) + if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR) && + self->label_width) + { XResizeWindow(ob_display, self->label, self->label_width, ob_rr_theme->label_height); - + } } static void frame_adjust_cursors(ObFrame *self) From 7e6b2eaef734039c5ee4c32e345284efc88bf487 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 14 Jan 2010 15:03:06 -0500 Subject: [PATCH 3/4] Prefer to use larger images and scale down than to scale up (more distortion) --- render/image.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/render/image.c b/render/image.c index 48012d42..3698e81d 100644 --- a/render/image.c +++ b/render/image.c @@ -463,7 +463,9 @@ void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img, /* our size difference metric.. */ wdiff = self->original[i]->width - area->width; + if (wdiff < 0) wdiff *= 2; /* prefer scaling down than up */ hdiff = self->original[i]->height - area->height; + if (hdiff < 0) hdiff *= 2; /* prefer scaling down than up */ diff = (wdiff * wdiff) + (hdiff * hdiff); /* find the smallest difference */ From 374888f5e9c3c98204a708ef40afec86d136d836 Mon Sep 17 00:00:00 2001 From: Laszlo Dvornik Date: Fri, 8 Jan 2010 22:40:40 +0100 Subject: [PATCH 4/4] Update hungarian translation. --- po/hu.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/hu.po b/po/hu.po index d970bf3e..32203a73 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.4.10\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2010-01-08 22:39+0100\n" -"PO-Revision-Date: 2010-01-08 22:23+0100\n" +"POT-Creation-Date: 2010-01-07 14:19-0500\n" +"PO-Revision-Date: 2010-01-14 11:04+0100\n" "Last-Translator: Laszlo Dvornik \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgstr "Kilépés" #: openbox/actions/exit.c:67 msgid "Are you sure you want to log out?" -msgstr "Biztos, hogy ki akarsz jelentkezni?" +msgstr "Biztos ki akar jelentkezni?" #: openbox/actions/exit.c:68 msgid "Log Out"