Cleanup of gconf and a few other things, patch from Kjartan Maraas

2005-05-22  Sebastien Bacher  <seb128@debian.org>

        * ChangeLog capplets/about-me/e-image-chooser.c
        capplets/accessibility/at-properties/at-startup-session.h
        capplets/accessibility/keyboard/accessibility-keyboard.c
        capplets/background/gnome-wp-info.c
        capplets/common/gconf-property-editor.c
        capplets/common/gnome-theme-apply.c
        capplets/default-applications/gnome-default-applications-properties.c
        capplets/keybindings/gnome-keybinding-properties.c
        capplets/keyboard/gnome-keyboard-properties.c
        capplets/mouse/gnome-mouse-properties.c
        capplets/network/gnome-network-preferences.c
        capplets/sound/sound-properties-capplet.c
        capplets/theme-switcher/gnome-theme-details.c
        capplets/theme-switcher/gnome-theme-manager.c
        capplets/ui-properties/gnome-ui-properties.c
        capplets/windows/gnome-window-properties.c
        gnome-settings-daemon/factory.c
        gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
        gnome-settings-daemon/gnome-settings-background.c
        gnome-settings-daemon/gnome-settings-daemon.c
        gnome-settings-daemon/gnome-settings-daemon.h
        gnome-settings-daemon/gnome-settings-font.c
        gnome-settings-daemon/gnome-settings-keybindings.c
        gnome-settings-daemon/gnome-settings-keybindings.h
        gnome-settings-daemon/gnome-settings-keyboard-xkb.c
        gnome-settings-daemon/gnome-settings-keyboard.c
        gnome-settings-daemon/gnome-settings-locate-pointer.h
        gnome-settings-daemon/gnome-settings-mouse.c
        gnome-settings-daemon/gnome-settings-multimedia-keys.c
        gnome-settings-daemon/gnome-settings-screensaver.c
        gnome-settings-daemon/gnome-settings-sound.c
        gnome-settings-daemon/gnome-settings-xmodmap.c
        gnome-settings-daemon/gnome-settings-xrdb.c
        gnome-settings-daemon/gnome-settings-xsettings.c
        libbackground/applier.c libbackground/applier.h
        libbackground/preferences.c libsounds/sound-properties.c
        libsounds/sound-view.h libwindow-settings/gnome-wm-manager.c
        libwindow-settings/metacity-window-manager.c
        typing-break/drw-break-window.c typing-break/drw-utils.h
        typing-break/drwright.c vfs-methods/fontilus/font-view.c
        vfs-methods/themus/themus-theme-applier.c:
        Cleanup of gconf and a few other things,
        patch from Kjartan Maraas <kmaraas@gnome.org> (Closes: #301945).
This commit is contained in:
Sebastien Bacher 2005-05-22 15:46:45 +00:00 committed by Sebastien Bacher
parent 912f58a06f
commit 581c37e2bb
46 changed files with 238 additions and 109 deletions

View file

@ -21,18 +21,6 @@
# include <config.h>
#endif
#ifdef ENABLE_NLS
# include <libintl.h>
# define _(String) gettext(String)
# define N_(String) gettext_noop(String)
#else
# define _(String) (String)
# define N_(String) (String)
# define textdomain(String) (String)
# define bindtextdomain(Domain,Directory) (Domain)
# define bind_textdomain_codeset(Domain,Codeset) (Domain)
#endif
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_TYPE1_TABLES_H
@ -40,11 +28,13 @@
#include FT_TRUETYPE_IDS_H
#include <X11/Xlib.h>
#include <X11/Xft/Xft.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomeui/libgnomeui.h>
#include <libgnomeui/gnome-icon-lookup.h>
FT_Error FT_New_Face_From_URI(FT_Library library,
const gchar *uri,

View file

@ -19,6 +19,7 @@
#include <stdlib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libgnome/libgnome.h>
@ -34,7 +35,6 @@ int main (int argc, char **argv)
{
GnomeVFSURI *uri;
GnomeThemeMetaInfo *theme;
GConfClient *client;
GnomeProgram *program;
GladeXML *font_xml;
GtkWidget *font_dialog;
@ -90,8 +90,9 @@ int main (int argc, char **argv)
gnome_meta_theme_set (theme);
if (apply_font) {
client = gconf_client_get_default ();
GConfClient *client = gconf_client_get_default ();
gconf_client_set_string (client, FONT_KEY, theme->application_font, NULL);
g_object_unref (client);
}
return 0;