r11891 - in /desktop/experimental/control-center/debian: changelog patches/15_gconf_peditor.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Jul 11 12:34:54 2007
New Revision: 11891

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11891
Log:
* Re-add an updated 15_gconf_peditor patch which will avoid a warning when
  upgrading from older versions of the GConf schemas where some entries
  were not strings.

Added:
    desktop/experimental/control-center/debian/patches/15_gconf_peditor.patch
Modified:
    desktop/experimental/control-center/debian/changelog

Modified: desktop/experimental/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/changelog?rev=11891&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/changelog (original)
+++ desktop/experimental/control-center/debian/changelog Wed Jul 11 12:34:54 2007
@@ -1,3 +1,11 @@
+control-center (1:2.19.5-2) UNRELEASED; urgency=low
+
+  * Re-add an updated 15_gconf_peditor patch which will avoid a warning when
+    upgrading from older versions of the GConf schemas where some entries
+    were not strings.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 10 Jul 2007 19:17:46 +0200
+
 control-center (1:2.19.5-1) experimental; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/experimental/control-center/debian/patches/15_gconf_peditor.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/15_gconf_peditor.patch?rev=11891&op=file
==============================================================================
--- desktop/experimental/control-center/debian/patches/15_gconf_peditor.patch (added)
+++ desktop/experimental/control-center/debian/patches/15_gconf_peditor.patch Wed Jul 11 12:34:54 2007
@@ -1,0 +1,24 @@
+diff -Nur control-center-2.19.5/capplets/common/gconf-property-editor.c control-center-2.19.5.new/capplets/common/gconf-property-editor.c
+--- control-center-2.19.5/capplets/common/gconf-property-editor.c	2007-07-02 14:30:11.000000000 +0200
++++ control-center-2.19.5.new/capplets/common/gconf-property-editor.c	2007-07-11 13:50:33.000000000 +0200
+@@ -511,12 +511,14 @@
+ 
+ 	if (entry && (value = gconf_entry_get_value (entry))) {
+ 		value_wid = peditor->p->conv_to_widget_cb (peditor, value);
+-		entry_current_text = gtk_entry_get_text (GTK_ENTRY (peditor->p->ui_control));
+-		entry_current_integer = strtol (entry_current_text, NULL, 10);
+-		if (entry_current_integer != gconf_value_get_int (value)) {
+-			char *buf = g_strdup_printf ("%d", gconf_value_get_int (value_wid));
+-			gtk_entry_set_text (GTK_ENTRY (peditor->p->ui_control), buf);
+-			g_free (buf);
++		if (value->type == GCONF_VALUE_STRING) {
++			entry_current_text = gtk_entry_get_text (GTK_ENTRY (peditor->p->ui_control));
++			entry_current_integer = strtol (entry_current_text, NULL, 10);
++			if (entry_current_integer != gconf_value_get_int (value)) {
++				char *buf = g_strdup_printf ("%d", gconf_value_get_int (value_wid));
++				gtk_entry_set_text (GTK_ENTRY (peditor->p->ui_control), buf);
++				g_free (buf);
++			}
+ 		}
+ 		gconf_value_free (value_wid);
+ 	}