From eecccec11134227c1ecbd3654951ebf6579022ad Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 7 Apr 2014 20:08:21 +0100
Subject: [PATCH] Fix override of GtkApplication startup method
When overriding the startup method the parent impl must be
the first thing invoked.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
src/frontend/entangle-application.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/frontend/entangle-application.c b/src/frontend/entangle-application.c
index cff99cf..8b30c30 100644
--- a/src/frontend/entangle-application.c
+++ b/src/frontend/entangle-application.c
@@ -158,6 +158,8 @@ static void entangle_application_startup(GApplication *gapp)
EntangleApplicationPrivate *priv = app->priv;
GList *cameras = NULL, *tmp;
+ (*G_APPLICATION_CLASS(entangle_application_parent_class)->startup)(gapp);
+
if (entangle_preferences_interface_get_auto_connect(priv->preferences))
cameras = tmp = entangle_camera_list_get_cameras(priv->cameras);
@@ -181,8 +183,6 @@ static void entangle_application_startup(GApplication *gapp)
}
g_list_free(cameras);
}
-
- (*G_APPLICATION_CLASS(entangle_application_parent_class)->startup)(gapp);
}
--
1.9.0