← Back to branch summary

~attente/glib/gicon-upstream

« back to all changes in this revision

Viewing changes to gio/gsettings.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane, Josselin Mouette, Iain Lane
  • Date: 2012-10-17 11:51:14 UTC
  • mfrom: (172.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20121017115114-gqog9lavags5afi1
Tags: 2.34.1-1
https://launchpad.net/bugs/1044322
[ Josselin Mouette ]
* Require libelfg0-dev, not libelf-dev which has nothing to do with 
  it.

[ Iain Lane ]
* New upstream release
  + GTimeZone support for zoneinfo version 1
  + Leak in glib-compile-resources
  + g_settings_bind: use canonical property name
  + Port gio tests from pygobject to pygi
* Switch python-gobject-2 BD to python-gi, folowing porting of tests. 
* debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch:
  Cherry-pick upstream patch to fix crash when GBusNameVanishedCallback is
  called with a NULL GDBusConnection. (LP: #1044322)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gio/gsettings.c
2624
2624
      (binding->property->flags & G_PARAM_WRITABLE) == 0)
2625
2625
    {
2626
2626
      g_critical ("g_settings_bind: property '%s' on class '%s' is not "
2627
 
                  "writable", property, G_OBJECT_TYPE_NAME (object));
 
2627
                  "writable", binding->property->name, G_OBJECT_TYPE_NAME (object));
2628
2628
      return;
2629
2629
    }
2630
2630
  if ((flags & G_SETTINGS_BIND_SET) &&
2631
2631
      (binding->property->flags & G_PARAM_READABLE) == 0)
2632
2632
    {
2633
2633
      g_critical ("g_settings_bind: property '%s' on class '%s' is not "
2634
 
                  "readable", property, G_OBJECT_TYPE_NAME (object));
 
2634
                  "readable", binding->property->name, G_OBJECT_TYPE_NAME (object));
2635
2635
      return;
2636
2636
    }
2637
2637
 
2648
2648
        {
2649
2649
          g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN "
2650
2650
                      "was specified, but property `%s' on type `%s' has "
2651
 
                      "type `%s'", property, G_OBJECT_TYPE_NAME (object),
 
2651
                      "type `%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
2652
2652
                      g_type_name ((binding->property->value_type)));
2653
2653
          return;
2654
2654
        }
2671
2671
    {
2672
2672
      g_critical ("g_settings_bind: property '%s' on class '%s' has type "
2673
2673
                  "'%s' which is not compatible with type '%s' of key '%s' "
2674
 
                  "on schema '%s'", property, G_OBJECT_TYPE_NAME (object),
 
2674
                  "on schema '%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
2675
2675
                  g_type_name (binding->property->value_type),
2676
2676
                  g_variant_type_dup_string (binding->key.type), key,
2677
2677
                  g_settings_schema_get_id (settings->priv->schema));
2692
2692
 
2693
2693
  if (flags & G_SETTINGS_BIND_SET)
2694
2694
    {
2695
 
      detailed_signal = g_strdup_printf ("notify::%s", property);
 
2695
      detailed_signal = g_strdup_printf ("notify::%s", binding->property->name);
2696
2696
      binding->property_handler_id =
2697
2697
        g_signal_connect (object, detailed_signal,
2698
2698
                          G_CALLBACK (g_settings_binding_property_changed),
2720
2720
      g_settings_binding_key_changed (settings, binding->key.name, binding);
2721
2721
    }
2722
2722
 
2723
 
  binding_quark = g_settings_binding_quark (property);
 
2723
  binding_quark = g_settings_binding_quark (binding->property->name);
2724
2724
  g_object_set_qdata_full (object, binding_quark,
2725
2725
                           binding, g_settings_binding_free);
2726
2726
}