Permalink
Browse files

[gnome-control-center-ubuntu] Update to version 3.6.2 with Ubuntu ver…

…sion 3.4.2 and release 0ubuntu19
  • Loading branch information...
chenxiaolong committed Oct 24, 2012
1 parent 6d42e90 commit b9330d93c9d3281bfcdc2d79a6052b1353c2d70d
Showing with 19,798 additions and 139 deletions.
  1. +1,342 −0 gnome-control-center-ubuntu/0001_04_new_appearance_settings.patch
  2. +67 −0 gnome-control-center-ubuntu/0002_10_keyboard_layout_on_unity.patch
  3. +151 −0 gnome-control-center-ubuntu/0003_11_power-configure_lid_action.patch
  4. +27 −0 gnome-control-center-ubuntu/0004_12_add_never_turn_screen_off.patch
  5. +590 −0 gnome-control-center-ubuntu/0005_51_unity_options_in_display_panel.patch
  6. +56 −0 gnome-control-center-ubuntu/0006_54_enable_alt_tap_in_shortcut.patch
  7. +150 −0 gnome-control-center-ubuntu/0007_55_user_accounts_hide_controls.patch
  8. +12 −0 gnome-control-center-ubuntu/0008_57_use_nonsymbolic_keyboard_icon.patch
  9. +37 −0 gnome-control-center-ubuntu/0009_61_workaround_online_account.patch
  10. +21 −0 gnome-control-center-ubuntu/0010_62_update_translations_template.patch
  11. +12 −0 gnome-control-center-ubuntu/0011_64_restore_terminal_keyboard_shortcut.patch
  12. +21 −0 gnome-control-center-ubuntu/0012_90_force_fallback.patch
  13. +16,828 −0 gnome-control-center-ubuntu/0013_96_sound_nua_panel.patch
  14. +131 −0 gnome-control-center-ubuntu/0014_97_unity_power_ui.patch
  15. +12 −0 gnome-control-center-ubuntu/0015_98_default_sound_theme.patch
  16. +160 −0 gnome-control-center-ubuntu/0016_revert_git_drop_library.patch
  17. +61 −0 gnome-control-center-ubuntu/0017_99_add_lock-on-suspend.patch
  18. +12 −0 gnome-control-center-ubuntu/0018_dont_download_local_image.patch
  19. +25 −0 gnome-control-center-ubuntu/0019_fix-crash-on-user-panel.patch
  20. +9 −0 gnome-control-center-ubuntu/0020_classic_use_sound_indicator.patch
  21. +12 −0 gnome-control-center-ubuntu/0021_accounts_fix_unsetting_icon.patch
  22. +60 −56 gnome-control-center-ubuntu/PKGBUILD
  23. +2 −2 gnome-control-center-ubuntu/compare_versions.sh
  24. +0 −81 gnome-control-center-ubuntu/systemd-fallback.patch

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,67 @@
+diff -Nru gnome-control-center-3.5.92.orig/panels/region/cc-region-panel.c gnome-control-center-3.5.92/panels/region/cc-region-panel.c
+--- gnome-control-center-3.5.92.orig/panels/region/cc-region-panel.c 2012-09-21 15:05:22.252855893 -0400
++++ gnome-control-center-3.5.92/panels/region/cc-region-panel.c 2012-09-21 19:24:34.481242861 -0400
+@@ -134,10 +134,13 @@
+ {
+ CcRegionPanelPrivate *priv;
+ GtkWidget *prefs_widget;
++ const char *desktop;
+ GError *error = NULL;
+
+ priv = self->priv = REGION_PANEL_PRIVATE (self);
+
++ desktop = g_getenv ("XDG_CURRENT_DESKTOP");
++
+ priv->builder = gtk_builder_new ();
+
+ gtk_builder_add_from_file (priv->builder,
+@@ -149,16 +152,24 @@
+ return;
+ }
+
+- prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
+- "region_notebook");
++ if (!g_strcmp0 (desktop, "GNOME")) {
++ prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
++ "region_notebook");
++ } else {
++ prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
++ "vbox1");
++ }
++
+ gtk_widget_set_size_request (GTK_WIDGET (prefs_widget), -1, 400);
+
+ gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
+
+ setup_input_tabs (priv->builder, self);
+- setup_language (priv->builder);
+- setup_formats (priv->builder);
+- setup_system (priv->builder);
++ if (!g_strcmp0 (desktop, "GNOME")) {
++ setup_language (priv->builder);
++ setup_formats (priv->builder);
++ setup_system (priv->builder);
++ }
+ }
+
+ void
+diff -Nru gnome-control-center-3.5.92.orig/panels/region/gnome-region-panel.desktop.in.in gnome-control-center-3.5.92/panels/region/gnome-region-panel.desktop.in.in
+--- gnome-control-center-3.5.92.orig/panels/region/gnome-region-panel.desktop.in.in 2012-09-21 15:05:22.253855886 -0400
++++ gnome-control-center-3.5.92/panels/region/gnome-region-panel.desktop.in.in 2012-09-21 19:25:27.861213157 -0400
+@@ -1,13 +1,13 @@
+ [Desktop Entry]
+-_Name=Region & Language
++_Name=Keyboard Layout
+ _Comment=Change your region and language settings
+ Exec=gnome-control-center region
+-Icon=preferences-desktop-locale
++Icon=key_bindings
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
+-OnlyShowIn=GNOME;
++OnlyShowIn=GNOME;Unity;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+ X-GNOME-Bugzilla-Component=region
@@ -0,0 +1,151 @@
+diff -Nru gnome-control-center-3.5.92.orig/panels/power/cc-power-panel.c gnome-control-center-3.5.92/panels/power/cc-power-panel.c
+--- gnome-control-center-3.5.92.orig/panels/power/cc-power-panel.c 2012-09-21 19:29:50.600073021 -0400
++++ gnome-control-center-3.5.92/panels/power/cc-power-panel.c 2012-09-21 19:30:26.559058505 -0400
+@@ -932,6 +932,7 @@
+ set_ac_battery_ui_mode (CcPowerPanel *self)
+ {
+ gboolean has_batteries = FALSE;
++ gboolean has_lid = FALSE;
+ gboolean ret;
+ GError *error = NULL;
+ GPtrArray *devices;
+@@ -964,7 +965,13 @@
+ }
+ }
+ g_ptr_array_unref (devices);
++
++ has_lid = up_client_get_lid_is_present (self->priv->up_client);
++
+ out:
++ gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid);
++ gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid);
++ gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid);
+ gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries);
+ gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries);
+ gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries);
+@@ -1076,6 +1083,26 @@
+ G_CALLBACK (activate_link_cb),
+ self);
+
++ value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
++ widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
++ "combobox_lid_ac"));
++ disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
++ set_value_for_combo (GTK_COMBO_BOX (widget), value);
++ g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action");
++ g_signal_connect (widget, "changed",
++ G_CALLBACK (combo_enum_changed_cb),
++ self);
++
++ value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action");
++ widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
++ "combobox_lid_battery"));
++ disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
++ set_value_for_combo (GTK_COMBO_BOX (widget), value);
++ g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action");
++ g_signal_connect (widget, "changed",
++ G_CALLBACK (combo_enum_changed_cb),
++ self);
++
+ widget = WID (self->priv->builder, "vbox_power");
+ gtk_widget_reparent (widget, (GtkWidget *) self);
+ }
+diff -Nru gnome-control-center-3.5.92.orig/panels/power/power.ui gnome-control-center-3.5.92/panels/power/power.ui
+--- gnome-control-center-3.5.92.orig/panels/power/power.ui 2012-09-21 19:29:50.609073021 -0400
++++ gnome-control-center-3.5.92/panels/power/power.ui 2012-09-21 19:30:26.559058505 -0400
+@@ -53,6 +53,33 @@
+ </row>
+ </data>
+ </object>
++ <object class="GtkListStore" id="liststore_lid">
++ <columns>
++ <!-- column-name name -->
++ <column type="gchararray"/>
++ <!-- column-name value -->
++ <column type="gint"/>
++ <!-- column-name sensitive -->
++ <column type="gboolean"/>
++ </columns>
++ <data>
++ <row>
++ <col id="0" translatable="yes">Suspend</col>
++ <col id="1">1</col>
++ <col id="2">True</col>
++ </row>
++ <row>
++ <col id="0" translatable="yes">Hibernate</col>
++ <col id="1">3</col>
++ <col id="2">True</col>
++ </row>
++ <row>
++ <col id="0" translatable="yes">Do nothing</col>
++ <col id="1">5</col>
++ <col id="2">True</col>
++ </row>
++ </data>
++ </object>
+ <object class="GtkWindow" id="window_power">
+ <property name="can_focus">False</property>
+ <property name="resizable">False</property>
+@@ -172,6 +199,48 @@
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
++ <child>
++ <object class="GtkLabel" id="label_lid_action">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="halign">end</property>
++ <property name="label" translatable="yes">When the lid is closed</property>
++ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">3</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkComboBox" id="combobox_lid_battery">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="model">liststore_lid</property>
++ <property name="hexpand">True</property>
++ <accessibility>
++ <relation type="labelled-by" target="label_lid_action"/>
++ </accessibility>
++ </object>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="top_attach">3</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkComboBox" id="combobox_lid_ac">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="model">liststore_lid</property>
++ <property name="hexpand">True</property>
++ <accessibility>
++ <relation type="labelled-by" target="label_lid_action"/>
++ </accessibility>
++ </object>
++ <packing>
++ <property name="left_attach">2</property>
++ <property name="top_attach">3</property>
++ </packing>
++ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -352,9 +421,12 @@
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup_combos">
+ <widgets>
++ <widget name="combobox_lid_battery"/>
++ <widget name="combobox_lid_ac"/>
+ <widget name="combobox_critical"/>
+ <widget name="combobox_sleep_battery"/>
+ <widget name="combobox_sleep_ac"/>
++ <widget name="combobox_sleep_ac"/>
+ </widgets>
+ </object>
+ </interface>
@@ -0,0 +1,27 @@
+diff -Nru gnome-control-center-3.5.92.orig/panels/screen/cc-screen-panel.c gnome-control-center-3.5.92/panels/screen/cc-screen-panel.c
+--- gnome-control-center-3.5.92.orig/panels/screen/cc-screen-panel.c 2012-09-21 19:29:50.598073021 -0400
++++ gnome-control-center-3.5.92/panels/screen/cc-screen-panel.c 2012-09-21 19:31:07.770039316 -0400
+@@ -397,8 +397,7 @@
+ gtk_tree_model_get (model, &iter,
+ 1, &value_tmp,
+ -1);
+- if (value == value_tmp ||
+- (value_tmp > value_prev && value < value_tmp))
++ if (value == value_tmp)
+ {
+ gtk_combo_box_set_active_iter (combo_box, &iter);
+ return;
+diff -Nru gnome-control-center-3.5.92.orig/panels/screen/screen.ui gnome-control-center-3.5.92/panels/screen/screen.ui
+--- gnome-control-center-3.5.92.orig/panels/screen/screen.ui 2012-09-21 19:29:50.597073021 -0400
++++ gnome-control-center-3.5.92/panels/screen/screen.ui 2012-09-21 19:31:07.771039318 -0400
+@@ -83,6 +83,10 @@
+ <col id="0" translatable="yes">1 hour</col>
+ <col id="1">3600</col>
+ </row>
++ <row>
++ <col id="0" translatable="yes">Never</col>
++ <col id="1">0</col>
++ </row>
+ </data>
+ </object>
+ <object class="GtkWindow" id="window1">
Oops, something went wrong.

0 comments on commit b9330d9

Please sign in to comment.