Re: Attempt to clean up gconf usage in gnomecc some...

[Mark McLoughlin <markmc redhat com>]

Hey Kjartan,
	The HAVE_GTK_MULTIHEAD changes are fine - the !
defined(HAVE_GTK_MULTIHEAD) cases should have been removed ages ago.

	Couple of minor comments:

On Wed, 2005-04-20 at 20:52 +0200, Kjartan Maraas wrote:

> Index: capplets/mouse/gnome-mouse-properties.c
> ===================================================================
> RCS file: /cvs/gnome/gnome-control-center/capplets/mouse/gnome-mouse-properties.c,v
> retrieving revision 1.52
> diff -u -p -r1.52 gnome-mouse-properties.c
> --- capplets/mouse/gnome-mouse-properties.c     20 Aug 2004 16:50:57 -0000      1.52
> +++ capplets/mouse/gnome-mouse-properties.c     20 Apr 2005 18:36:36 -0000
> @@ -519,12 +522,14 @@ cursor_changed (GtkTreeSelection *select
>                             COLUMN_FONT_PATH, &cursor_font,
>                             -1);
>         if (cursor_font != NULL) {
> -               gconf_client_set_string (gconf_client_get_default (),
> +               client = gconf_client_get_default();
> +               gconf_client_set_string (client,
>                                          CURSOR_FONT_KEY, cursor_font, NULL);
>                 g_free (cursor_font);
>         } else
> -               gconf_client_unset (gconf_client_get_default (),
> +               gconf_client_unset (client,
>                                     CURSOR_FONT_KEY, NULL);
> +       g_object_unref (client);
>  }

	client isn't initialized in the cursor == NULL case.

> Index: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
> ===================================================================
> RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c,v
> retrieving revision 1.30
> diff -u -p -r1.30 gnome-settings-accessibility-keyboard.c
> --- gnome-settings-daemon/gnome-settings-accessibility-keyboard.c       14 Mar 2005 21:22:17 -0000      1.30
> +++ gnome-settings-daemon/gnome-settings-accessibility-keyboard.c       20 Apr 2005 18:36:36 -0000
> @@ -23,9 +23,16 @@
>  
>  #include "config.h"
>  
> -#include <libgnome/gnome-i18n.h>
> +#include <glib/gi18n.h>
>  #include <gdk/gdk.h>
>  #include <gdk/gdkx.h>
> +#include <gtk/gtkdialog.h>
> +#include <gtk/gtkhbox.h>
> +#include <gtk/gtkimage.h>
> +#include <gtk/gtklabel.h>
> +#include <gtk/gtkmessagedialog.h>
> +#include <gtk/gtkstock.h>

	Its recommended to just use <gtk/gtk.h> and <gdk/gdk.h> rather than
individual gtk headers. You've changed it to use the individual headers
in a good few places.

Cheers,
Mark.