applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure that appearance.h (and thereby config.h) is included first;

Browse source 
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
This commit is contained in:
Jens Granseuer 2007-05-09 19:50:39 +00:00 • committed by Jens Granseuer
parent 60bf46d133
commit 9b3abdb95d
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/appearance/ChangeLog
View file

@ -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> 2007-05-08 Denis Washington <denisw@svn.nome.org>
* appearance.glade: * appearance.glade:

6
capplets/appearance/appearance-style.c
View file

@ -17,11 +17,11 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <gtk/gtk.h> #include "appearance.h"
#include <string.h> #include <string.h>
#include "gnome-theme-info.h" #include "gnome-theme-info.h"
#include "appearance.h"
#include "gconf-property-editor.h" #include "gconf-property-editor.h"
enum ThemeType { enum ThemeType {
@ -31,7 +31,7 @@ enum ThemeType {
CURSOR_THEMES CURSOR_THEMES
}; };
static gchar *gconf_keys[] = { static const gchar *gconf_keys[] = {
"/desktop/gnome/interface/gtk_theme", "/desktop/gnome/interface/gtk_theme",
"/apps/metacity/general/theme", "/apps/metacity/general/theme",
"/desktop/gnome/interface/icon_theme", "/desktop/gnome/interface/icon_theme",

1
capplets/appearance/gnome-wp-xml.c
View file

@ -229,6 +229,7 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
wp->fileinfo = gnome_wp_info_new (wp->filename, data->wp_thumbs); wp->fileinfo = gnome_wp_info_new (wp->filename, data->wp_thumbs);
if (wp->name == NULL || !strcmp (wp->filename, "(none)")) { if (wp->name == NULL || !strcmp (wp->filename, "(none)")) {
g_free (wp->name);
wp->name = g_strdup (wp->fileinfo->name); wp->name = g_strdup (wp->fileinfo->name);
} }