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
This commit is contained in:
parent
60bf46d133
commit
9b3abdb95d
3 changed files with 11 additions and 3 deletions
|
@ -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:
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue