Merge branch 'backport' into work Conflicts: openbox/frame.c
Dana Jansens danakj@orodu.net
4 files changed,
10 insertions(+),
6 deletions(-)
M
data/xsession/openbox-gnome-session.in
→
data/xsession/openbox-gnome-session.in
@@ -37,7 +37,7 @@ # make sure openbox is going to be run
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
M
obrender/image.c
→
obrender/image.c
@@ -532,7 +532,9 @@ gdouble myasp;
/* 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 */
M
openbox/frame.c
→
openbox/frame.c
@@ -861,10 +861,12 @@ match the changes */
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(obt_display, self->label, self->label_width, ob_rr_theme->label_height); - + } } static void frame_adjust_cursors(ObFrame *self)
M
po/hu.po
→
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 <dvornik@gnome.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\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"