Merge lp:~attente/ubuntu/quantal/gnome-control-center/bug-1070905 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[William Hua]

  * debian/patches/check_settings_schema.patch
    - don't crash in the a11y panel if the overlay scrollbars are not
      installed (lp: #1070905)

[Allison Karlitskaya (desrt)]

In a case like this (where the original patch contained a bug) it's more usual to update that patch rather than add another patch on top of it...

I hope you enjoy quilt :)

[lp:~attente/ubuntu/quantal/gnome-control-center/bug-1070905]

501. By William Hua on 2012-10-25

* debian/patches/04_new_appearance_settings.patch
  - use g_settings_schema_source_lookup to determine availability
    of settings schema
* debian/patches/63_normal_scrollbar_in_a11y.patch
  - merge debian/patches/check_settings_schema.patch
* debian/patches/check_settings_schema.patch
  - removed, merged into above

502. By William Hua on 2012-10-25

Remove unnecessary entry in debian/changelog.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-09 15:03:43 +0000
+++ debian/changelog	2012-10-25 15:08:21 +0000
@@ -1,3 +1,14 @@
+gnome-control-center (1:3.4.2-0ubuntu20) quantal; urgency=low
+
+  * debian/patches/04_new_appearance_settings.patch
+    - use g_settings_schema_source_lookup to determine availability
+      of settings schema
+  * debian/patches/63_normal_scrollbar_in_a11y.patch
+    - don't crash in the a11y panel if the overlay scrollbars are not
+      installed (lp: #1070905)
+
+ -- William Hua <[e-mail]>  Wed, 24 Oct 2012 23:50:07 -0400
+
 gnome-control-center (1:3.4.2-0ubuntu19) quantal; urgency=low
 
   * debian/patches/clutter_init.patch:

=== modified file 'debian/patches/04_new_appearance_settings.patch'
--- debian/patches/04_new_appearance_settings.patch	2012-10-03 16:37:41 +0000
+++ debian/patches/04_new_appearance_settings.patch	2012-10-25 15:08:21 +0000
@@ -1,7 +1,7 @@
 Index: gnome-control-center-3.4.2/panels/background/background.ui
 ===================================================================
---- gnome-control-center-3.4.2.orig/panels/background/background.ui	2012-10-03 18:22:42.180575065 +0200
-+++ gnome-control-center-3.4.2/panels/background/background.ui	2012-10-03 18:22:44.832575073 +0200
+--- gnome-control-center-3.4.2.orig/panels/background/background.ui	2012-10-25 10:02:13.498331007 -0400
++++ gnome-control-center-3.4.2/panels/background/background.ui	2012-10-25 10:03:38.154335105 -0400
 @@ -1,7 +1,6 @@
 -<?xml version="1.0"?>
 +<?xml version="1.0" encoding="UTF-8"?>
@@ -1187,8 +1187,8 @@
  </interface>
 Index: gnome-control-center-3.4.2/panels/background/cc-background-panel.c
 ===================================================================
---- gnome-control-center-3.4.2.orig/panels/background/cc-background-panel.c	2012-10-03 18:22:42.180575065 +0200
-+++ gnome-control-center-3.4.2/panels/background/cc-background-panel.c	2012-10-03 18:31:18.932576619 +0200
+--- gnome-control-center-3.4.2.orig/panels/background/cc-background-panel.c	2012-10-25 10:02:13.498331007 -0400
++++ gnome-control-center-3.4.2/panels/background/cc-background-panel.c	2012-10-25 10:10:48.714355945 -0400
 @@ -69,6 +69,11 @@
  #endif
  
@@ -1291,7 +1291,7 @@
  
        gdk_color_parse (cc_background_item_get_pcolor (priv->current_background), &pcolor);
        gdk_color_parse (cc_background_item_get_scolor (priv->current_background), &scolor);
-@@ -1162,12 +1228,503 @@
+@@ -1162,12 +1228,498 @@
    g_strfreev(uris);
  }
  
@@ -1349,7 +1349,9 @@
 +    return;
 +
 +  g_settings_delay (self->priv->interface_settings);
-+  g_settings_delay (self->priv->canonical_interface_settings);
++
++  if (self->priv->canonical_interface_settings != NULL)
++    g_settings_delay (self->priv->canonical_interface_settings);
 +
 +  g_settings_set_string (self->priv->interface_settings, "gtk-theme", gtk_theme);
 +  g_settings_set_string (self->priv->interface_settings, "icon-theme", icon_theme);
@@ -1384,22 +1386,15 @@
 +  gint i, current_theme_index = 0;
 +  GtkWidget *widget;
 +  GtkWidget *liststore;
-+  const gchar * const *schemas;
++  GSettingsSchemaSource *source;
 +  CcBackgroundPanelPrivate *priv = self->priv;
 +  GSettings *defaults_settings = g_settings_new ("org.gnome.desktop.interface");
 +
 +  priv->interface_settings = g_settings_new ("org.gnome.desktop.interface");
 +
-+  schemas = g_settings_list_schemas ();
-+  while (*schemas != NULL)
-+    {
-+      if (g_strcmp0 (*schemas, CANONICAL_DESKTOP_INTERFACE) == 0)
-+        {
-+          priv->canonical_interface_settings = g_settings_new (CANONICAL_DESKTOP_INTERFACE);
-+          break;
-+        }
-+      schemas++;
-+    }
++  source = g_settings_schema_source_get_default ();
++  if (source != NULL && g_settings_schema_source_lookup (source, CANONICAL_DESKTOP_INTERFACE, TRUE) != NULL)
++    priv->canonical_interface_settings = g_settings_new (CANONICAL_DESKTOP_INTERFACE);
 +
 +  priv->wm_theme_settings = g_settings_new ("org.gnome.desktop.wm.preferences");
 +  current_gtk_theme = g_settings_get_string (priv->interface_settings, "gtk-theme");
@@ -1796,7 +1791,7 @@
    GError *err = NULL;
    GtkWidget *widget;
    GtkListStore *store;
-@@ -1177,9 +1734,14 @@
+@@ -1177,9 +1729,14 @@
  
    priv->builder = gtk_builder_new ();
  
@@ -1814,7 +1809,7 @@
  
    if (err)
      {
-@@ -1230,7 +1792,10 @@
+@@ -1230,7 +1787,10 @@
  
  
    /* add the top level widget */
@@ -1826,7 +1821,7 @@
  
    gtk_container_add (GTK_CONTAINER (self), widget);
    gtk_widget_show_all (GTK_WIDGET (self));
-@@ -1301,6 +1866,18 @@
+@@ -1301,6 +1861,18 @@
  
    /* Setup the edit box with our current settings */
    source_update_edit_box (priv, TRUE);
@@ -1847,8 +1842,8 @@
  void
 Index: gnome-control-center-3.4.2/panels/background/gnome-background-panel.desktop.in.in
 ===================================================================
---- gnome-control-center-3.4.2.orig/panels/background/gnome-background-panel.desktop.in.in	2012-10-03 18:22:42.180575065 +0200
-+++ gnome-control-center-3.4.2/panels/background/gnome-background-panel.desktop.in.in	2012-10-03 18:22:44.836575073 +0200
+--- gnome-control-center-3.4.2.orig/panels/background/gnome-background-panel.desktop.in.in	2012-10-25 10:02:13.498331007 -0400
++++ gnome-control-center-3.4.2/panels/background/gnome-background-panel.desktop.in.in	2012-10-25 10:03:38.158335105 -0400
 @@ -1,6 +1,6 @@
  [Desktop Entry]
 -_Name=Background

=== modified file 'debian/patches/63_normal_scrollbar_in_a11y.patch'
--- debian/patches/63_normal_scrollbar_in_a11y.patch	2012-10-02 17:22:32 +0000
+++ debian/patches/63_normal_scrollbar_in_a11y.patch	2012-10-25 15:08:21 +0000
@@ -1,8 +1,19 @@
 Index: gnome-control-center-3.4.2/panels/universal-access/cc-ua-panel.c
 ===================================================================
---- gnome-control-center-3.4.2.orig/panels/universal-access/cc-ua-panel.c	2012-04-10 17:01:29.000000000 +0200
-+++ gnome-control-center-3.4.2/panels/universal-access/cc-ua-panel.c	2012-10-02 18:07:53.320752834 +0200
-@@ -44,6 +44,7 @@
+--- gnome-control-center-3.4.2.orig/panels/universal-access/cc-ua-panel.c	2012-10-25 10:02:11.890330931 -0400
++++ gnome-control-center-3.4.2/panels/universal-access/cc-ua-panel.c	2012-10-25 10:21:20.182386505 -0400
+@@ -31,8 +31,9 @@
+ 
+ #include "zoom-options.h"
+ 
+-#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)
++#define CANONICAL_DESKTOP_INTERFACE "com.canonical.desktop.interface"
+ 
++#define WID(b, w) (GtkWidget *) gtk_builder_get_object (b, w)
+ 
+ G_DEFINE_DYNAMIC_TYPE (CcUaPanel, cc_ua_panel, CC_TYPE_PANEL)
+ 
+@@ -44,6 +45,7 @@
    GtkBuilder *builder;
    GSettings *wm_settings;
    GSettings *interface_settings;
@@ -10,7 +21,7 @@
    GSettings *kb_settings;
    GSettings *mouse_settings;
    GSettings *application_settings;
-@@ -109,6 +110,12 @@
+@@ -109,6 +111,12 @@
        priv->interface_settings = NULL;
      }
  
@@ -23,16 +34,19 @@
    if (priv->kb_settings)
      {
        g_object_unref (priv->kb_settings);
-@@ -423,11 +430,21 @@
+@@ -423,11 +431,25 @@
  
    if (g_strcmp0 (theme_name, ""))
      {
 +      /* disable overlay scrollbars for a11y */
-+      if (g_strcmp0 (theme_name, "HighContrast") == 0 ||
-+          g_strcmp0 (theme_name, "HighContrastInverse") == 0)
-+        g_settings_set_string (priv->canonical_interface_settings, "scrollbar-mode", "normal");
-+      else
-+        g_settings_reset (priv->canonical_interface_settings, "scrollbar-mode");
++      if (priv->canonical_interface_settings != NULL)
++        {
++          if (g_strcmp0 (theme_name, "HighContrast") == 0 ||
++              g_strcmp0 (theme_name, "HighContrastInverse") == 0)
++            g_settings_set_string (priv->canonical_interface_settings, "scrollbar-mode", "normal");
++          else
++            g_settings_reset (priv->canonical_interface_settings, "scrollbar-mode");
++        }
 +
        g_settings_set_string (priv->interface_settings, GTK_THEME_KEY, theme_name);
        g_settings_set_string (priv->interface_settings, ICON_THEME_KEY, theme_name);
@@ -40,16 +54,28 @@
    else
      {
 +      /* reset overlay scrollbars key */
-+      g_settings_reset (priv->canonical_interface_settings, "scrollbar-mode");
++      if (priv->canonical_interface_settings != NULL)
++        g_settings_reset (priv->canonical_interface_settings, "scrollbar-mode");
 +
        g_settings_reset (priv->interface_settings, GTK_THEME_KEY);
        g_settings_reset (priv->interface_settings, ICON_THEME_KEY);
      }
-@@ -772,6 +789,7 @@
-     }
- 
-   priv->interface_settings = g_settings_new ("org.gnome.desktop.interface");
-+  priv->canonical_interface_settings = g_settings_new ("com.canonical.desktop.interface");
-   g_signal_connect (priv->interface_settings, "changed",
+@@ -738,6 +760,7 @@
+ static void
+ cc_ua_panel_init (CcUaPanel *self)
+ {
++  GSettingsSchemaSource *source;
+   CcUaPanelPrivate *priv;
+   GtkWidget *widget;
+   GError *err = NULL;
+@@ -776,6 +799,10 @@
                      G_CALLBACK (interface_settings_changed_cb), self);
    interface_settings_changed_cb (priv->interface_settings, "gtk-theme", self);
+ 
++  source = g_settings_schema_source_get_default ();
++  if (source != NULL && g_settings_schema_source_lookup (source, CANONICAL_DESKTOP_INTERFACE, TRUE) != NULL)
++    priv->canonical_interface_settings = g_settings_new (CANONICAL_DESKTOP_INTERFACE);
++
+   priv->wm_settings = g_settings_new ("org.gnome.desktop.wm.preferences");
+   priv->kb_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
+   priv->mouse_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");