← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gio/gapplication.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/gapplication.c
278
278
static void g_application_action_group_iface_init (GActionGroupInterface *);
279
279
static void g_application_action_map_iface_init (GActionMapInterface *);
280
280
G_DEFINE_TYPE_WITH_CODE (GApplication, g_application, G_TYPE_OBJECT,
 
281
 G_ADD_PRIVATE (GApplication)
281
282
 G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP, g_application_action_group_iface_init)
282
283
 G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_MAP, g_application_action_map_iface_init))
283
284
 
692
693
static void
693
694
g_application_init (GApplication *application)
694
695
{
695
 
  application->priv = G_TYPE_INSTANCE_GET_PRIVATE (application,
696
 
                                                   G_TYPE_APPLICATION,
697
 
                                                   GApplicationPrivate);
 
696
  application->priv = g_application_get_instance_private (application);
698
697
 
699
698
  application->priv->actions = g_application_exported_actions_new (application);
700
699
 
845
844
                  g_signal_accumulator_first_wins, NULL,
846
845
                  NULL,
847
846
                  G_TYPE_INT, 1, G_TYPE_APPLICATION_COMMAND_LINE);
848
 
 
849
 
  g_type_class_add_private (class, sizeof (GApplicationPrivate));
850
847
}
851
848
 
852
849
static GVariant *