← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde-workspace/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/0031-Fix-wrong-inital-tab-in-keyboard-kcm.patch

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2011-09-25 00:42:41 UTC
  • Revision ID: package-import@ubuntu.com-20110925004241-c5ck55dokn3yt1kg
Tags: 4:4.7.1-0ubuntu3
https://launchpad.net/bugs/854329
* Update debian/kdm.upstart to match latest gdm.upstart improvements:
  - Also export LC_MESSAGES with the rest of locale information
  - When kdm is shut down by a runlevel call, emit an upstart event that can
    be caught by plymouth so it can distinguish between the DM shutting down
    for a runlevel change vs. other causes (LP: #854329)
* Update patches for post-4.7.1 changes.  Add to debian/patches:
    0001-SVN_SILENT-made-messages-.desktop-file.patch
    0003-SVN_SILENT-made-messages-.desktop-file.patch
    0004-SVN_SILENT-made-messages-.desktop-file.patch
    0005-SVN_SILENT-made-messages-.desktop-file.patch
    0006-preferred-app-launchers-need-to-use-the-type-of-the-.patch
    0007-SVN_SILENT-made-messages-.desktop-file.patch
    0009-SVN_SILENT-made-messages-.desktop-file.patch
    0010-add-some-missing-connects-for-the-ruleswidget.patch
    0011-fix-yet-another-fun-with-pointers-tabbing-segfault.patch
    0013-catch-changeMaximize-recursion-from-setNoBorder.patch
    0014-Clear-thumbnails-for-deleted-windows.patch
    0015-Fix-pointer-accesses-in-tiling-code.patch
    0016-SVN_SILENT-made-messages-.desktop-file.patch
    0017-SVN_SILENT-made-messages-.desktop-file.patch
    0018-SVN_SILENT-made-messages-.desktop-file.patch
    0019-Test-for-widget-creation-before-deleting-property-at.patch
    0020-SVN_SILENT-made-messages-.desktop-file.patch
    0023-fix-kiosk-restrictions-for-user-switching-and-logout.patch
    0024-Fix-typo-use-the-right-signal-signature.patch
    0025-Repaint-old-area-of-the-thumbnail.patch
    0026-Use-Client-layoutMetric-to-access-shadowSize-instead.patch
    0027-ShowCalendarPopup-false-suppresses-calendar-popup-an.patch
    0028-show-the-keyboard-on-immediately-entering-a-text-are.patch
    0029-Repaint-the-whole-window-in-the-taskbar-thumbnail.patch
    0030-SVN_SILENT-made-messages-.desktop-file.patch
    0031-Fix-wrong-inital-tab-in-keyboard-kcm.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0031-Fix-wrong-inital-tab-in-keyboard-kcm.patch
 
1
From 5c38825b8a72b8cdbfae34105f6ffe330acbecc8 Mon Sep 17 00:00:00 2001
 
2
From: Andriy Rysin <arysin@gmail.com>
 
3
Date: Tue, 20 Sep 2011 21:14:47 -0400
 
4
Subject: [PATCH 31/31] Fix wrong inital tab in keyboard kcm
 
5
 BUG: 281655
 
6
 FIXED-IN: 4.7.1
 
7
 
 
8
---
 
9
 kcontrol/keyboard/kcm_keyboard_widget.cpp |    7 ++++---
 
10
 1 files changed, 4 insertions(+), 3 deletions(-)
 
11
 
 
12
diff --git a/kcontrol/keyboard/kcm_keyboard_widget.cpp b/kcontrol/keyboard/kcm_keyboard_widget.cpp
 
13
index 1b5f558..e94640f 100644
 
14
--- a/kcontrol/keyboard/kcm_keyboard_widget.cpp
 
15
+++ b/kcontrol/keyboard/kcm_keyboard_widget.cpp
 
16
@@ -50,7 +50,7 @@ static const QString LV3_SWITCH_GROUP_NAME("lv3");
 
17
 //static const QString RESET_XKB_OPTIONS("-option");
 
18
 
 
19
 static const int TAB_HARDWARE = 0;
 
20
-//static const int TAB_LAYOUTS = 1;
 
21
+static const int TAB_LAYOUTS = 1;
 
22
 static const int TAB_ADVANCED = 2;
 
23
 
 
24
 static const int MIN_LOOPING_COUNT = 2;
 
25
@@ -95,14 +95,15 @@ KCMKeyboardWidget::~KCMKeyboardWidget()
 
26
 void KCMKeyboardWidget::handleParameters(const QVariantList &args)
 
27
 {
 
28
     // TODO: improve parameter handling
 
29
+       setCurrentIndex(TAB_HARDWARE);
 
30
     foreach(const QVariant& arg, args) {
 
31
          if( arg.type() == QVariant::String ) {
 
32
                  QString str = arg.toString();
 
33
                  if( str == "--tab=layouts" ) {
 
34
-                         setCurrentIndex(1);
 
35
+                         setCurrentIndex(TAB_LAYOUTS);
 
36
                  }
 
37
                  else if( str == "--tab=advanced" ) {
 
38
-                         setCurrentIndex(2);
 
39
+                         setCurrentIndex(TAB_ADVANCED);
 
40
                  }
 
41
          }
 
42
     }
 
43
-- 
 
44
1.7.4.1
 
45