From: Dana Jansens Date: Tue, 24 Apr 2007 15:59:24 +0000 (+0000) Subject: merge r5875 from trunk X-Git-Tag: openbox-3_3_991-RELEASE~229 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=467f47d5bbe6a44b8b2a6458108d2a9a2879435e;p=dana%2Fopenbox.git merge r5875 from trunk --- diff --git a/openbox/client.c b/openbox/client.c index 0ff67ac5..2f4e1772 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1887,7 +1887,25 @@ void client_update_icons(ObClient *self) } } - if (self->frame) + /* set the default icon onto the window + in theory, this could be a race, but if a window doesn't set an icon + or removes it entirely, it's not very likely it is going to set one + right away afterwards */ + if (self->nicons == 0) { + RrPixel32 *icon = ob_rr_theme->def_win_icon; + + data = g_new(guint32, 48*48+2); + data[0] = data[1] = 48; + for (i = 0; i < 48*48; ++i) + data[i+2] = (((icon[i] >> RrDefaultAlphaOffset) & 0xff) << 24) + + (((icon[i] >> RrDefaultRedOffset) & 0xff) << 16) + + (((icon[i] >> RrDefaultGreenOffset) & 0xff) << 8) + + (((icon[i] >> RrDefaultBlueOffset) & 0xff) << 0); + PROP_SETA32(self->window, net_wm_icon, cardinal, data, 48*48+2); + g_free(data); + } else if (self->frame) + /* don't draw the icon empty if we're just setting one now anyways, + we'll get the property change any second */ frame_adjust_icon(self->frame); } diff --git a/po/ca.po b/po/ca.po index f6270ad2..b7e683d5 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2004-01-25 20:41+0100\n" "Last-Translator: David Majà Martínez \n" "Language-Team: catalan\n" diff --git a/po/de.po b/po/de.po index 9cdf4bf8..d8b4a32c 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2006-06-11 10:41+0200\n" "Last-Translator: Sebastian Vahl \n" "Language-Team: \n" diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 16da36f0..e20d4e20 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -32,8 +32,8 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.4.0\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" -"PO-Revision-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" +"PO-Revision-Date: 2007-04-24 11:39-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" diff --git a/po/en@quot.po b/po/en@quot.po index 529e5687..23903c12 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.4.0\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" -"PO-Revision-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" +"PO-Revision-Date: 2007-04-24 11:39-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" diff --git a/po/es.po b/po/es.po index 1093552a..693827ad 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2005-03-25 09:31+0100\n" "Last-Translator: Miguel Calleja Gómez \n" "Language-Team: None\n" diff --git a/po/fi.po b/po/fi.po index 3633d957..e0baba2c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2005-03-15 21:29+0200\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 934f52e8..8c42f67d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2004-06-11 23:06+0200\n" "Last-Translator: Julien Louis \n" "Language-Team: French \n" diff --git a/po/hr.po b/po/hr.po index f097d684..b429887b 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2006-09-05 16:45+0100\n" "Last-Translator: Daniel Radetic \n" "Language-Team: None\n" diff --git a/po/ja.po b/po/ja.po index f06e942e..99e9d08b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.0\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2003-11-20 15:00+0900\n" "Last-Translator: Yukihiro Nakai \n" "Language-Team: Japanese \n" diff --git a/po/no.po b/po/no.po index ef99c0ca..4530ddf5 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Øyvind Albrigtsen\n" "Language-Team: None\n" diff --git a/po/pl.po b/po/pl.po index d02b7977..64a673ca 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2004-09-07 21:17+0200\n" "Last-Translator: Madej \n" "Language-Team: NONE\n" diff --git a/po/pt.po b/po/pt.po index 80d9c844..6312441f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Gonçalo Ferreira \n" "Language-Team: None\n" diff --git a/po/ru.po b/po/ru.po index 8b50017f..efc10f0f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2004-04-23 13:00+0300\n" "Last-Translator: Alexey Remizov \n" "Language-Team: Russian \n" diff --git a/po/sk.po b/po/sk.po index 8cfc8032..eda5e044 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox-3.3rc2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2006-08-25 00:52+0200\n" "Last-Translator: Jozef Riha \n" diff --git a/po/sv.po b/po/sv.po index 24277887..d15efc88 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: None\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 23a4859b..46a083fc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.3rc2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2007-04-24 03:05-0400\n" +"POT-Creation-Date: 2007-04-24 11:39-0400\n" "PO-Revision-Date: 2006-03-01 12:00+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n"