← Back to branch summary

~ubuntu-branches/ubuntu/saucy/glib2.0/saucy-proposed

« back to all changes in this revision

Viewing changes to gio/gsettings.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-06-25 12:43:56 UTC
  • mfrom: (1.63.22)
  • Revision ID: package-import@ubuntu.com-20130625124356-597xf4lpikauchiy
Tags: 2.37.3-1ubuntu1
* Resynchronise on unrelease Debian SVN (glib is in NEW there). Remaining
  change:
  - Build-Depend on python:any for cross building.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gio/gsettings.c
265
265
 
266
266
static guint g_settings_signals[N_SIGNALS];
267
267
 
268
 
G_DEFINE_TYPE (GSettings, g_settings, G_TYPE_OBJECT)
 
268
G_DEFINE_TYPE_WITH_PRIVATE (GSettings, g_settings, G_TYPE_OBJECT)
269
269
 
270
270
/* Signals {{{1 */
271
271
static gboolean
603
603
static void
604
604
g_settings_init (GSettings *settings)
605
605
{
606
 
  settings->priv = G_TYPE_INSTANCE_GET_PRIVATE (settings,
607
 
                                                G_TYPE_SETTINGS,
608
 
                                                GSettingsPrivate);
609
 
 
 
606
  settings->priv = g_settings_get_instance_private (settings);
610
607
  settings->priv->main_context = g_main_context_ref_thread_default ();
611
608
}
612
609
 
623
620
  object_class->constructed = g_settings_constructed;
624
621
  object_class->finalize = g_settings_finalize;
625
622
 
626
 
  g_type_class_add_private (object_class, sizeof (GSettingsPrivate));
627
 
 
628
623
  /**
629
624
   * GSettings::changed:
630
625
   * @settings: the object on which the signal was emitted