merge r5875 from trunk

diff --git a/openbox/client.c b/openbox/client.c
index 0ff67ac51fc2c970f64c29280378dbca3d3f0b1d..2f4e177241b3a186595a8d09d0532bd508bda899 100644 (file)
--- 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 f6270ad2b9a2b9c0b576184a441304cbe13b1ee2..b7e683d533a8373e58e076cf6aad4d8345ab94e4 100644 (file)
--- 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 <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"

diff --git a/po/de.po b/po/de.po
index 9cdf4bf8f56f07dbb72e685f40b74bde85e3f4dd..d8b4a32c922bb1b97ff204861f67291748a8ae56 100644 (file)
--- 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 <svahl@web.de>\n"
 "Language-Team:  <de@li.org>\n"

diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 16da36f05496480c244cd743afe9bfa10e61bcb2..e20d4e20a94be50c89832e4495c86a20f87e15c8 100644 (file)
--- 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 529e5687d0d216a595bbf7d27d44f326d372edff..23903c129e055ba449c1600e7008664bf152a3d9 100644 (file)
--- 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 1093552a9d7c0c7b934261841f15e1275f3cec4a..693827adf315a2ad08a1cf654ba1b7d4ff34cd41 100644 (file)
--- 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 <mcg79@lycos.es>\n"
 "Language-Team: None\n"

diff --git a/po/fi.po b/po/fi.po
index 3633d957fff67c9778a30dbd8cfe0175f9cb7dc9..e0baba2c18905309b5522a017a876e924ccae922 100644 (file)
--- 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 <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"

diff --git a/po/fr.po b/po/fr.po
index 934f52e833e06ac5acde9ab2c2176a72f29edc64..8c42f67d9560cf904e2e6af0d0240c7820951ccc 100644 (file)
--- 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 <leonptitlouis@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"

diff --git a/po/hr.po b/po/hr.po
index f097d684100aab66e6cd8b60cf4cdc5022525988..b429887bc8c8b8ba4c2dcf124e2ded7d081a4db6 100644 (file)
--- 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 <drade@boobah.info>\n"
 "Language-Team: None\n"

diff --git a/po/ja.po b/po/ja.po
index f06e942ed93b970927d71995e15ddc4bc67f8602..99e9d08b98edeef1eabb9895a73037680fb91c0f 100644 (file)
--- 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 <nakai@gnome.gr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"

diff --git a/po/no.po b/po/no.po
index ef99c0caf4ec0d37276136ad5fd45c4f13cafd14..4530ddf5154e8ed2cef76d260449bdc2f692df03 100644 (file)
--- 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 d02b79778553947ef03db345ef63dc76fd29602b..64a673caa0cdc84da7d00b09f72449108663e423 100644 (file)
--- 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 <madej@afn.no-ip.org>\n"
 "Language-Team: NONE\n"

diff --git a/po/pt.po b/po/pt.po
index 80d9c844d6ae14528a5dc346db0f50d6c4f99ad9..6312441f1be3f42fbf1aef397c50ed477390a276 100644 (file)
--- 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 <gonsas@gmail.com>\n"
 "Language-Team: None\n"

diff --git a/po/ru.po b/po/ru.po
index 8b50017fef2e8370a32256a598d22164c172b329..efc10f0f30831969c95a1deccd370000f63acef6 100644 (file)
--- 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 <alexey@remizov.pp.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"

diff --git a/po/sk.po b/po/sk.po
index 8cfc8032cd07b9dd090f1b9e773e565eba18b270..eda5e044053745d0476c07f528b6a88ccb5ecaeb 100644 (file)
--- 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 <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\n"

diff --git a/po/sv.po b/po/sv.po
index 2427788773d7d9b976ae26f15f9a427be25f95fb..d15efc88548925d33842a80f50c6993ee42469f9 100644 (file)
--- 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 <mikachu@icculus.org>\n"
 "Language-Team: None\n"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 23a4859bba95af753c2ba69cb8713778faec6782..46a083fcbf95182d04419542082a6eed23e94bf3 100644 (file)
--- 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 <william.chao@ossii.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"