diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-10-23 02:47:29 +0800 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-10-30 00:35:09 +0800 |
| commit | 4c8dc9d04de6f80c8e5406495e71d0dca9f73369 (patch) | |
| tree | c74d5ba1b29700a5535ac2b77df651bf883d9bc0 /src | |
| parent | f0bc602802fd56095886b1d6b1b054a44320973d (diff) | |
| download | gsoc2013-empathy-4c8dc9d04de6f80c8e5406495e71d0dca9f73369.tar gsoc2013-empathy-4c8dc9d04de6f80c8e5406495e71d0dca9f73369.tar.gz gsoc2013-empathy-4c8dc9d04de6f80c8e5406495e71d0dca9f73369.tar.bz2 gsoc2013-empathy-4c8dc9d04de6f80c8e5406495e71d0dca9f73369.tar.lz gsoc2013-empathy-4c8dc9d04de6f80c8e5406495e71d0dca9f73369.tar.xz gsoc2013-empathy-4c8dc9d04de6f80c8e5406495e71d0dca9f73369.tar.zst gsoc2013-empathy-4c8dc9d04de6f80c8e5406495e71d0dca9f73369.zip | |
Cut out unnecessary empathy_app_new().
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/empathy.c b/src/empathy.c index 1081fd1b7..b2005f19c 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -175,31 +175,6 @@ static void account_manager_ready_cb (GObject *source_object, GAsyncResult *result, gpointer user_data); -static EmpathyApp * -empathy_app_new (guint argc, - const gchar * const * argv, - gboolean no_connect, - gboolean start_hidden) -{ - EmpathyApp *self; - GError *error = NULL; - GVariant *argv_variant; - - argv_variant = g_variant_new_bytestring_array (argv, argc); - - self = g_object_new (EMPATHY_TYPE_APP, - "application-id", EMPATHY_DBUS_NAME, - NULL); - - if (self == NULL) - { - g_critical ("Failed to initiate EmpathyApp: %s", error->message); - g_error_free (error); - } - - return self; -} - static void empathy_app_set_property (GObject *object, guint prop_id, @@ -683,8 +658,9 @@ main (int argc, char *argv[]) empathy_gtk_init (); - app = empathy_app_new (argc, (const gchar * const *) argv, - no_connect, start_hidden); + app = g_object_new (EMPATHY_TYPE_APP, + "application-id", EMPATHY_DBUS_NAME, + NULL); g_application_run (G_APPLICATION (app), argc, argv); |