Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/control-center-16-mouse-dialog.diff
author gf115653
Fri, 14 Jul 2006 19:35:57 +0000
changeset 7641 be56ee2129b0
parent 7414 patches/control-center-19-mouse-dialog.diff@6d01567e4399
permissions -rw-r--r--
2006-07-15 Glynn Foster <[email protected]> * control-center.spec: Update. * patches/control-center-04-keyboard-layout.diff, * patches/control-center-06-xkb-workaround.diff, * patches/control-center-14-no-xkb-dialog.diff, * patches/control-center-17-xkb-check-remote-login.diff: Remove these keyboard layout patches to be replaced with a single patch that removes the layout functionality. This affects both the gnome-settings-daemon and the keyboard preference dialog. * control-center-04-remove-xkb-layout.diff: Add new patch. * control-center-*.diff: Rename the rest.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7414
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     1
 
--- control-center-2.14.1/capplets/mouse/gnome-mouse-properties.c-orig	2006-06-09 11:10:52.922270000 +0100
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     2
 
+++ control-center-2.14.1/capplets/mouse/gnome-mouse-properties.c	2006-06-09 10:03:29.251483000 +0100
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     3
 
@@ -532,6 +532,13 @@
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     4
 
 	model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT(smodel));
6927
e7dc913905c1 2006-03-14 Glynn Foster <[email protected]>
gman
parents:
diff changeset 
     5
7414
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     6
 
 	cursor_font = gconf_client_get_string (client, CURSOR_FONT_KEY, NULL);
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     7
 
+
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     8
 
+	/* If there's no value set, then don't select anything, and return */
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
     9
 
+	if ( cursor_font == NULL ) {
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
    10
 
+		gtk_tree_selection_unselect_all(selection);
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
    11
 
+		return;
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
    12
 
+	}
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
    13
 
+
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
    14
 
 	gtk_tree_model_get_iter_root (model, &iter);
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
    15
6d01567e4399 2006-06-09 Darren Kenny <[email protected]>
darrenk
parents: 6927
diff changeset 
    16
 
 	do {
sustaining/oi_151a/spec-files