From 9b3abdb95d79ec0e44fb9f67fd7c5c35b6153386 Mon Sep 17 00:00:00 2001
From: Jens Granseuer <jensgr@gmx.net>
Date: Wed, 9 May 2007 19:50:39 +0000
Subject: [PATCH] make sure that appearance.h (and thereby config.h) is
 included first;

2007-05-09  Jens Granseuer  <jensgr@gmx.net>

	* appearance-style.c: make sure that appearance.h (and thereby config.h)
	is included first; constify strings

	* gnome-wp-xml.c: (gnome_wp_xml_load_xml): fix leak

svn path=/trunk/; revision=7590
---
 capplets/appearance/ChangeLog          | 7 +++++++
 capplets/appearance/appearance-style.c | 6 +++---
 capplets/appearance/gnome-wp-xml.c     | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index a8f8989a7..79eadd2e9 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-09  Jens Granseuer  <jensgr@gmx.net>
+
+	* appearance-style.c: make sure that appearance.h (and thereby config.h)
+	is included first; constify strings
+
+	* gnome-wp-xml.c: (gnome_wp_xml_load_xml): fix leak
+
 2007-05-08  Denis Washington  <denisw@svn.nome.org>
 
 	* appearance.glade:
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index b5252d4b7..712a8e989 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -17,11 +17,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include <gtk/gtk.h>
+#include "appearance.h"
+
 #include <string.h>
 
 #include "gnome-theme-info.h"
-#include "appearance.h"
 #include "gconf-property-editor.h"
 
 enum ThemeType {
@@ -31,7 +31,7 @@ enum ThemeType {
   CURSOR_THEMES
 };
 
-static gchar *gconf_keys[] = {
+static const gchar *gconf_keys[] = {
   "/desktop/gnome/interface/gtk_theme",
   "/apps/metacity/general/theme",
   "/desktop/gnome/interface/icon_theme",
diff --git a/capplets/appearance/gnome-wp-xml.c b/capplets/appearance/gnome-wp-xml.c
index c853018d5..ffd824c04 100644
--- a/capplets/appearance/gnome-wp-xml.c
+++ b/capplets/appearance/gnome-wp-xml.c
@@ -229,6 +229,7 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
 	wp->fileinfo = gnome_wp_info_new (wp->filename, data->wp_thumbs);
 
 	if (wp->name == NULL || !strcmp (wp->filename, "(none)")) {
+	  g_free (wp->name);
 	  wp->name = g_strdup (wp->fileinfo->name);
 	}