diff options
| author | Sebastien Bacher <seb128@debian.org> | 2005-05-22 15:46:45 +0000 |
|---|---|---|
| committer | Sebastien Bacher <sbacher@src.gnome.org> | 2005-05-22 15:46:45 +0000 |
| commit | 581c37e2bb79b784625d52909e9589b88ee21324 (patch) | |
| tree | 3f0c8abd7dc244785ae09bff6773ceece8d94c55 /typing-break/drw-break-window.c | |
| parent | 912f58a06f958f1149215a9adce5bebfe1ba6168 (diff) | |
| download | gnome-control-center-581c37e2bb79b784625d52909e9589b88ee21324.tar.gz | |
Cleanup of gconf and a few other things, patch from Kjartan MaraasNAUTILUS_2_11_2
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).
Diffstat (limited to 'typing-break/drw-break-window.c')
| -rw-r--r-- | typing-break/drw-break-window.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c index 267263164..0fac2efc4 100644 --- a/typing-break/drw-break-window.c +++ b/typing-break/drw-break-window.c @@ -23,10 +23,10 @@ #include <config.h> #include <string.h> #include <math.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <gconf/gconf-client.h> -#include <libgnome/gnome-i18n.h> #include "drwright.h" #include "drw-utils.h" #include "drw-break-window.h" @@ -151,18 +151,21 @@ drw_break_window_init (DrwBreakWindow *window) GdkRectangle monitor; gint right_padding; gint bottom_padding; - + GConfClient *client; priv = g_new0 (DrwBreakWindowPriv, 1); window->priv = priv; - priv->break_time = 60 * gconf_client_get_int (gconf_client_get_default (), + client = gconf_client_get_default(); + + priv->break_time = 60 * gconf_client_get_int (client, GCONF_PATH "/break_time", NULL); - allow_postpone = gconf_client_get_bool (gconf_client_get_default (), + allow_postpone = gconf_client_get_bool (client, GCONF_PATH "/allow_postpone", NULL); + g_object_unref (client); GTK_WINDOW (window)->type = GTK_WINDOW_POPUP; @@ -414,12 +417,14 @@ postpone_entry_activate_cb (GtkWidget *entry, { const gchar *str; const gchar *phrase; + GConfClient *client = gconf_client_get_default(); str = gtk_entry_get_text (GTK_ENTRY (entry)); - phrase = gconf_client_get_string (gconf_client_get_default (), + phrase = gconf_client_get_string (client, GCONF_PATH "/unlock_phrase", NULL); + g_object_unref (client); if (!strcmp (str, phrase)) { g_signal_emit (window, signals[POSTPONE], 0, NULL); |