applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

13
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -391,6 +391,8 @@ clear_old_model (GladeXML *dialog,
g_object_unref (model);
}
g_object_unref (client);
model = (GtkTreeModel *) gtk_tree_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
sort_model = gtk_tree_model_sort_new_with_model (model);
@ -425,13 +427,17 @@ static gboolean
should_show_key (const KeyListEntry *entry)
{
gint workspaces;
GConfClient *client;
switch (entry->visibility) {
case ALWAYS_VISIBLE:
return TRUE;
case N_WORKSPACES_GT:
workspaces = gconf_client_get_int (gconf_client_get_default (),
client = gconf_client_get_default();
workspaces = gconf_client_get_int (client,
"/apps/metacity/general/num_workspaces", NULL);
g_object_unref (client);
if (workspaces > entry->data)
return TRUE;
else
@ -544,6 +550,8 @@ append_keys_to_tree (GladeXML *dialog,
gconf_schema_free (schema);
}
g_object_unref (client);
if (i == 0)
gtk_widget_hide (WID ("shortcuts_vbox"));
else
@ -884,6 +892,7 @@ setup_dialog (GladeXML *dialog)
"/apps/metacity/general/num_workspaces",
(GConfClientNotifyFunc) &key_entry_controlling_key_changed,
dialog, NULL, NULL);
g_object_unref (client);
/* set up the dialog */
reload_key_entries (wm_common_get_current_window_manager(), dialog);