gnome-control-center r8693 - trunk/capplets/common

[jensg svn gnome org]

Author: jensg
Date: Tue May  6 18:37:55 2008
New Revision: 8693
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8693&view=rev

Log:
2008-05-06  Jens Granseuer  <jensgr gmx net>

	* gnome-theme-info.c: (gnome_theme_meta_info_validate): fix error
	code when GTK engine is missing, and fix the function signature


Modified:
   trunk/capplets/common/ChangeLog
   trunk/capplets/common/gnome-theme-info.c

Modified: trunk/capplets/common/gnome-theme-info.c
==============================================================================
--- trunk/capplets/common/gnome-theme-info.c	(original)
+++ trunk/capplets/common/gnome-theme-info.c	Tue May  6 18:37:55 2008
@@ -1561,12 +1561,12 @@
 }
 
 gboolean
-gnome_theme_meta_info_validate (GnomeThemeMetaInfo *info, GError **error)
+gnome_theme_meta_info_validate (const GnomeThemeMetaInfo *info, GError **error)
 {
   GnomeThemeInfo *theme;
   gchar *gtkrc;
 
-  g_assert (error == NULL || *error == NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   theme = gnome_theme_info_find (info->gtk_theme_name);
   if (!theme || !theme->has_gtk) {
@@ -1609,7 +1609,7 @@
       g_free (full);
 
       if (!found) {
-        g_set_error (error, GNOME_THEME_ERROR, GNOME_THEME_ERROR_GTK_THEME_NOT_AVAILABLE,
+        g_set_error (error, GNOME_THEME_ERROR, GNOME_THEME_ERROR_GTK_ENGINE_NOT_AVAILABLE,
                      _("This theme will not look as intended because the required GTK+ theme engine '%s' is not installed."),
                      (gchar *) l->data);
         break;