Commit 0b424bcd authored by Jasper Huijsmans's avatar Jasper Huijsmans
Browse files

I wish I would have done this before 4.2.3 :(

 * Fix issues with saving a panel on a second screen (bug #1133)
 * Use a timeout to save configuration (bug #1178)


(Old svn revision: 19013)
parent 2b3fd451
NEWS for xfce4-panel
====================
4.2.3.1
=======
- Fix issues with saving a panel on a second screen (bug #1133) (Jasper)
- Use a timeout to save configuration (bug #1178) (Jasper)
4.2.3
=====
- Updated translations (Jean-François, Daichi)
......
......@@ -7,7 +7,7 @@ dnl
AC_INIT([panel/main.c])
AM_INIT_AUTOMAKE([xfce4-panel], [4.2.3])
AM_INIT_AUTOMAKE([xfce4-panel], [4.2.3.1])
AM_CONFIG_HEADER([config.h])
......
......@@ -47,12 +47,18 @@
#define XML_FORMAT_VERSION 2
#define WRITE_TIMEOUT 10000
G_MODULE_EXPORT /* EXPORT:disable_user_config */
gboolean disable_user_config = FALSE;
G_MODULE_EXPORT /* EXPORT:xmlconfig */
xmlDocPtr xmlconfig = NULL;
/* delayed saving */
static int final_write_timeout = 0;
/* Configuration
* -------------
*/
......@@ -202,6 +208,27 @@ get_panel_config (void)
xmlconfig = NULL;
}
static gboolean
write_timeout (void)
{
final_write_timeout = 0;
write_final_panel_config ();
return FALSE;
}
static void
queue_final_write (void)
{
if (final_write_timeout == 0)
{
final_write_timeout =
g_timeout_add (WRITE_TIMEOUT,
(GSourceFunc)write_timeout, NULL);
}
}
G_MODULE_EXPORT /* EXPORT:write_panel_config */
void
write_panel_config (void)
......@@ -213,7 +240,7 @@ write_panel_config (void)
if (disable_user_config)
return;
xfcerc = get_save_file ("contents.xml.active");
xfcerc = get_save_file ("contents.xml");
if (!xfcerc)
{
......@@ -221,7 +248,7 @@ write_panel_config (void)
return;
}
tmprc = g_strconcat (xfcerc, ".tmp", NULL);
tmprc = g_strconcat (xfcerc, ".active", NULL);
xmlconfig = xmlNewDoc ("1.0");
xmlconfig->children = xmlNewDocRawNode (xmlconfig, NULL, ROOT, NULL);
......@@ -242,23 +269,8 @@ write_panel_config (void)
goto out;
}
if (g_file_test (xfcerc, G_FILE_TEST_EXISTS) && unlink (xfcerc))
{
g_critical ("Could not remove old contents.xml");
goto out;
}
if (link (tmprc, xfcerc))
{
g_critical ("Could not link new contents.xml");
goto out;
}
if (unlink (tmprc))
{
g_warning ("Could not remove temporary file contents.xml.tmp");
}
queue_final_write ();
out:
g_free (tmprc);
g_free (xfcerc);
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-08-20 01:22+0900\n"
"Last-Translator: Petri Jooste <petri.jooste@gmail.com>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "Selekteer lêer"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Geen data gevind. Die paneel sal leeg wees."
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:32+0900\n"
"Last-Translator: Saleh Alhathal <hathalsal@hotmail.com>\n"
"Language-Team: Arabic <lumina@silverpen.de>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "إختر ملف"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:33+0900\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
......@@ -20,7 +20,7 @@ msgstr ""
msgid "Select file"
msgstr "Faylı seç"
#: panel/settings.c:181
#: panel/settings.c:187
#, fuzzy
msgid "No data was found. The panel will be empty."
msgstr "Heç bir məlumat tapılmadı. Panel boş olacaqdır"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-28 20:57+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-10-27 18:58+0900\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "Вылучыць файл"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Даньні ня знойдзены. Панэля нічога ня будзе ўтрымліваць."
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-09 15:52+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-08-21 15:13+0900\n"
"Last-Translator: Miroslav Yordanov <miordanov@i-space.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "Избира файл"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:44+0900\n"
"Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
"Language-Team: Bangla INDIA<LL@li.org>\n"
......@@ -20,7 +20,7 @@ msgstr ""
msgid "Select file"
msgstr "ফাইল নির্বাচন করুন"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "কোনো ডাটা পাওয়া যায়নি। প্যানেলটি ফাঁকা রাখা হবে।"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:45+0900\n"
"Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
......@@ -21,7 +21,7 @@ msgstr ""
msgid "Select file"
msgstr "Seleccioneu el fitxer"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "No s'han trobat dades. El plafó es mostrarà buit."
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:46+0900\n"
"Last-Translator: Alois Nespor <Alois.Nespor@seznam.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
......@@ -21,7 +21,7 @@ msgstr ""
msgid "Select file"
msgstr "Vybrat soubor"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Nenalezeny žádné data. Panel bude prázdný."
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:46+0900\n"
"Last-Translator: Jesper Berth <bigsanta@berthit.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "Vælg fil"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Data ikke fundet, panelet bliver tomt"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:47+0900\n"
"Last-Translator: Moritz Heiber <moe@xfce.org>\n"
"Language-Team: German <de@li.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "Datei auswählen"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Keine Daten gefunden. Das Panel wird leer sein"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:47+0900\n"
"Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
......@@ -20,7 +20,7 @@ msgstr ""
msgid "Select file"
msgstr "Επιλογή αρχείου"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Δεν βρέθηκαν δεδομένα. Το ταμπλώ θα είναι άδειο"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:48+0900\n"
"Last-Translator: Translate.org.za <info@translate.org.za>\n"
"Language-Team: British English <en_gb@li.org>\n"
......@@ -20,7 +20,7 @@ msgstr ""
msgid "Select file"
msgstr "Select file"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "No data was found. The panel will be empty."
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-10-10 23:52+0200\n"
"Last-Translator: Sylvain Vedrenne <sylvain.vedrenne@free.fr>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
......@@ -20,7 +20,7 @@ msgstr ""
msgid "Select file"
msgstr "Elektu dosieron"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Malsukcesis trovi ian datumon. La panelo estos malplena."
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-08-20 01:25+0900\n"
"Last-Translator: Edscott Wilson García <edscott@xfce.org>\n"
"Language-Team: Spanish <es@li.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "Seleccionar archivo"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "No se encontró información. El panel estará vacío"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-08-20 01:26+0900\n"
"Last-Translator: Edscott Wilson García <edscott@xfce.org>\n"
"Language-Team: Spanish <es@li.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "Select file"
msgstr "Seleccionar archivo"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "No se encontró información. El panel estará vacío"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-09 15:52+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:49+0900\n"
"Last-Translator: Mart Tõnso <mart.tonso@ttu.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
......@@ -20,7 +20,7 @@ msgstr ""
msgid "Select file"
msgstr "Vali fail"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Mingeid andmeid ei leitud. Paneel on tühi."
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-panel 4.2.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-10-08 06:14+0900\n"
"POT-Creation-Date: 2005-12-07 12:32+0100\n"
"PO-Revision-Date: 2005-09-29 13:50+0900\n"
"Last-Translator: Piarres Beobide Egaña <pi@beobide.net>\n"
"Language-Team: Euskara <librezale@librezale.org>\n"
......@@ -22,7 +22,7 @@ msgstr ""
msgid "Select file"
msgstr "Fitxategia aukeratu"
#: panel/settings.c:181
#: panel/settings.c:187
msgid "No data was found. The panel will be empty."
msgstr "Ez da datarik aurkitu. Panela hutsik egongo da."
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment