diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-14 16:19:57 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-14 16:19:57 -0500 |
| commit | 3bd4397b6ec5212bfe53a36892746962dc45dbeb (patch) | |
| tree | 0aa06742564779de5995e9145368da1275cee3bd | |
| parent | 937b529893cb93859245ad2f0e46d31bfd2f8097 (diff) | |
| parent | 374888f5e9c3c98204a708ef40afec86d136d836 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/frame.c
| -rw-r--r-- | data/xsession/openbox-gnome-session.in | 2 | ||||
| -rw-r--r-- | obrender/image.c | 2 | ||||
| -rw-r--r-- | openbox/frame.c | 6 | ||||
| -rw-r--r-- | po/hu.po | 6 |
4 files changed, 10 insertions, 6 deletions
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 diff --git a/obrender/image.c b/obrender/image.c index 671b7aee..f86a3ee0 100644 --- a/obrender/image.c +++ b/obrender/image.c @@ -532,7 +532,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 */ diff --git a/openbox/frame.c b/openbox/frame.c index 084f3f6a..8835c632 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -861,10 +861,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(obt_display, self->label, self->label_width, ob_rr_theme->label_height); - + } } static void frame_adjust_cursors(ObFrame *self) @@ -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" |