← Back to branch summary

~laney/gnome-control-center/3.5.4

« back to all changes in this revision

Viewing changes to debian/patches/10_keyboard_layout_on_unity.patch

  • Committer: Robert Ancell
  • Date: 2012-06-08 05:04:31 UTC
  • Revision ID: robert.ancell@canonical.com-20120608050431-3ovhtdgal4306p8k
* New upstream release
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev
  - Add build-depends on libclutter-1.0-dev, libclutter-gtk-1.0-dev,
    libpwquality-dev
  - Drop build-depends on libgnomekbd-dev
* debian/patches/58_ubuntu_icon_views_redesign.patch:
* debian/patches/60_ubuntu_nav_bar.patch:
  - Disabled for now, doesn't apply
* debian/patches/revert_ua_gsettings.patch:
  - We can use GSettings for universal access now
* debian/patches/00git_online_accounts_gtkgrid.patch:
* debian/patches/00git_online_accounts_layout.part:
* debian/patches/git_wacom_translations.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_keyboard_layout_on_unity.patch
1
 
Index: gnome-control-center-3.3.91/panels/region/cc-region-panel.c
 
1
Index: gnome-control-center-3.5.2/panels/region/cc-region-panel.c
2
2
===================================================================
3
 
--- gnome-control-center-3.3.91.orig/panels/region/cc-region-panel.c    2011-09-08 18:24:08.000000000 +0200
4
 
+++ gnome-control-center-3.3.91/panels/region/cc-region-panel.c 2012-03-06 17:52:14.351082976 +0100
5
 
@@ -130,10 +130,13 @@
 
3
--- gnome-control-center-3.5.2.orig/panels/region/cc-region-panel.c     2012-06-02 12:49:21.000000000 +1200
 
4
+++ gnome-control-center-3.5.2/panels/region/cc-region-panel.c  2012-06-08 16:40:15.004351422 +1200
 
5
@@ -139,10 +139,13 @@
6
6
 {
7
7
        CcRegionPanelPrivate *priv;
8
8
        GtkWidget *prefs_widget;
16
16
        priv->builder = gtk_builder_new ();
17
17
 
18
18
        gtk_builder_add_from_file (priv->builder,
19
 
@@ -145,16 +148,24 @@
 
19
@@ -154,16 +157,24 @@
20
20
                return;
21
21
        }
22
22
 
34
34
 
35
35
        gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
36
36
 
37
 
        setup_xkb_tabs (priv->builder);
 
37
         setup_input_tabs (priv->builder, self);
38
38
-       setup_language (priv->builder);
39
39
-       setup_formats (priv->builder);
40
40
-       setup_system (priv->builder);
46
46
 }
47
47
 
48
48
 void
49
 
Index: gnome-control-center-3.3.91/panels/region/gnome-region-panel.desktop.in.in
 
49
Index: gnome-control-center-3.5.2/panels/region/gnome-region-panel.desktop.in.in
50
50
===================================================================
51
 
--- gnome-control-center-3.3.91.orig/panels/region/gnome-region-panel.desktop.in.in     2012-03-05 15:04:55.000000000 +0100
52
 
+++ gnome-control-center-3.3.91/panels/region/gnome-region-panel.desktop.in.in  2012-03-06 17:52:14.355082976 +0100
 
51
--- gnome-control-center-3.5.2.orig/panels/region/gnome-region-panel.desktop.in.in      2011-12-20 18:11:50.000000000 +1300
 
52
+++ gnome-control-center-3.5.2/panels/region/gnome-region-panel.desktop.in.in   2012-06-08 16:40:15.004351422 +1200
53
53
@@ -1,13 +1,13 @@
54
54
 [Desktop Entry]
55
55
-_Name=Region and Language