[Xfce4-commits] <xfce4-panel:master> Save changed plugin ids if a plugin failed to load.
Nick Schermer
noreply at xfce.org
Sun Jan 29 12:20:01 CET 2012
Updating branch refs/heads/master
to bf00f797ac67bbbb9eab971b734a61ee728b8e5c (commit)
from 95fdcccae23bf0ebd5b46cdc8d830f357006c4ab (commit)
commit bf00f797ac67bbbb9eab971b734a61ee728b8e5c
Author: Nick Schermer <nick at xfce.org>
Date: Sun Jan 29 12:18:24 2012 +0100
Save changed plugin ids if a plugin failed to load.
panel/panel-application.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/panel/panel-application.c b/panel/panel-application.c
index 6b8d2dd..db10e70 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -317,6 +317,7 @@ panel_application_load_real (PanelApplication *application)
GValue val = { 0, };
GPtrArray *panels;
gint panel_id;
+ gboolean save_changed_ids = FALSE;
panel_return_if_fail (PANEL_IS_APPLICATION (application));
panel_return_if_fail (XFCONF_IS_CHANNEL (application->xfconf));
@@ -402,6 +403,9 @@ panel_application_load_real (PanelApplication *application)
/* show warnings */
g_message ("Plugin \"%s-%d\" was not found and has been "
"removed from the configuration", name, unique_id);
+
+ /* save configuration change after loading */
+ save_changed_ids = TRUE;
}
g_free (name);
@@ -417,6 +421,9 @@ panel_application_load_real (PanelApplication *application)
/* create empty window if everything else failed */
if (G_UNLIKELY (application->windows == NULL))
panel_application_new_window (application, NULL, -1, TRUE);
+
+ if (save_changed_ids)
+ panel_application_save (application, SAVE_PLUGIN_IDS);
}
More information about the Xfce4-commits
mailing list