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-15-no-xkb-dialog.diff
author laca
Tue, 16 Aug 2005 02:15:23 +0000
changeset 5541 a96a5552504d
permissions -rw-r--r--
2005-08-15 Laszlo Peter <[email protected]> * control-center.spec: remove patches read-alert-dialog.diff and menu-reorder.diff. Renumber remaining patches. * patches/control-center-14-read-alert-dialog.diff: drop * patches/control-center-15-menu-reorder.diff: drop
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5541
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     1
 
--- control-center-2.10.1/gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2005-03-01 04:34:52.000000000 +0530
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     2
 
+++ control-center-2.10.1-new/gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2005-08-04 21:14:48.638271752 +0530
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     3
 
@@ -169,7 +169,8 @@ apply_xkb_settings (void)
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     4
 
 			}
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     5
 
 		} else {
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     6
 
 			g_warning ("Could not activate the XKB configuration");
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     7
 
-			activation_error ();
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     8
 
+			initedOk = FALSE;
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
     9
 
+			return;
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
    10
 
 		}
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
    11
 
 	} else
a96a5552504d 2005-08-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset 
    12
 
 		XklDebug (100, "Actual KBD configuration was not changed: redundant notification\n");
sustaining/oi_151a/spec-files