From a68876827bd9ba53c20b9db35349df62bb895e28 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 5 Feb 2011 03:10:21 +0000
Subject: [PATCH] More accurate preferences dialog

---
 po/fr.po    | 16 ++++++++--------
 src/panel.c |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 24da3f1..cb70b62 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Panel 0.0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-05 04:00+0100\n"
+"POT-Creation-Date: 2011-02-05 04:10+0100\n"
 "PO-Revision-Date: 2010-04-22 12:45+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -83,8 +83,8 @@ msgstr "Verrouiller l'écran"
 msgid "Logging out is disabled"
 msgstr "Se déconnecter est désactivé"
 
-#: ../src/applets/logout.c:70 ../src/panel.c:664 ../src/panel.c:671
-#: ../src/panel.c:679
+#: ../src/applets/logout.c:70 ../src/panel.c:666 ../src/panel.c:673
+#: ../src/panel.c:681
 msgid "Logout"
 msgstr "Déconnexion"
 
@@ -196,7 +196,7 @@ msgstr "Taille du bas :"
 msgid "General"
 msgstr "Générales"
 
-#: ../src/panel.c:654
+#: ../src/panel.c:656
 msgid ""
 "This will log you out of the current session, therefore closing any "
 "application currently opened and losing any unsaved data.\n"
@@ -207,7 +207,7 @@ msgstr ""
 "sauvegardées.\n"
 "Voulez-vous continuer?"
 
-#: ../src/panel.c:748
+#: ../src/panel.c:750
 msgid ""
 "This will shutdown your device, therefore closing any application currently "
 "opened and losing any unsaved data.\n"
@@ -218,7 +218,7 @@ msgstr ""
 "sauvegardées.\n"
 "Voulez-vous continuer?"
 
-#: ../src/panel.c:753
+#: ../src/panel.c:755
 msgid ""
 "This will shutdown your computer, therefore closing any application "
 "currently opened and losing any unsaved data.\n"
@@ -229,11 +229,11 @@ msgstr ""
 "sauvegardées.\n"
 "Voulez-vous continuer?"
 
-#: ../src/panel.c:770 ../src/panel.c:775 ../src/panel.c:782
+#: ../src/panel.c:772 ../src/panel.c:777 ../src/panel.c:784
 msgid "Shutdown"
 msgstr "Arrêter"
 
-#: ../src/panel.c:774
+#: ../src/panel.c:776
 msgid "Restart"
 msgstr "Redémarrer"
 
diff --git a/src/panel.c b/src/panel.c
index 7e55c61..3cf756d 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -529,7 +529,8 @@ static void _preferences_on_cancel(gpointer data)
 	const size_t cnt = sizeof(_panel_sizes) / sizeof(*_panel_sizes);
 
 	gtk_widget_hide(panel->pr_window);
-	if((p = config_get(panel->config, NULL, "bottom_size")) != NULL)
+	if((p = config_get(panel->config, "", "bottom_size")) != NULL
+			|| (p = config_get(panel->config, "", "size")) != NULL)
 		for(i = 0; i < cnt; i++)
 		{
 			if(strcmp(p, _panel_sizes[i].alias) != 0)
@@ -538,7 +539,8 @@ static void _preferences_on_cancel(gpointer data)
 						panel->pr_bottom_size), i);
 			break;
 		}
-	if((p = config_get(panel->config, NULL, "top_size")) != NULL)
+	if((p = config_get(panel->config, "", "top_size")) != NULL
+			|| (p = config_get(panel->config, "", "size")) != NULL)
 		for(i = 0; i < cnt; i++)
 		{
 			if(strcmp(p, _panel_sizes[i].alias) != 0)