diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-07-23 20:09:11 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-07-23 20:09:11 +0800 |
| commit | 1e02bad1344fa4ddc750c95ce6cc135145a1c548 (patch) | |
| tree | 09a36dd5d83af2a73c970cff41e905dd0dce8d8d | |
| parent | 18ded7a66d2b4ee00d5d36ecc7154566c83dce69 (diff) | |
| download | gsoc2013-empathy-1e02bad1344fa4ddc750c95ce6cc135145a1c548.tar gsoc2013-empathy-1e02bad1344fa4ddc750c95ce6cc135145a1c548.tar.gz gsoc2013-empathy-1e02bad1344fa4ddc750c95ce6cc135145a1c548.tar.bz2 gsoc2013-empathy-1e02bad1344fa4ddc750c95ce6cc135145a1c548.tar.lz gsoc2013-empathy-1e02bad1344fa4ddc750c95ce6cc135145a1c548.tar.xz gsoc2013-empathy-1e02bad1344fa4ddc750c95ce6cc135145a1c548.tar.zst gsoc2013-empathy-1e02bad1344fa4ddc750c95ce6cc135145a1c548.zip | |
coding style fixes
| -rw-r--r-- | libempathy-gtk/empathy-roster-view.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index b54ebc100..90d7296eb 100644 --- a/libempathy-gtk/empathy-roster-view.c +++ b/libempathy-gtk/empathy-roster-view.c @@ -1458,7 +1458,7 @@ empathy_roster_view_new (EmpathyIndividualManager *manager, { g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (manager), NULL); g_return_val_if_fail (EMPATHY_IS_ROSTER_MODEL (model), NULL); - + return g_object_new (EMPATHY_TYPE_ROSTER_VIEW, "manager", manager, "model", model, diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 5cdcf28ad..6dc1a3277 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -1259,7 +1259,7 @@ password_feature_prepare_cb (GObject *source, gpointer user_data) { EmpathyTpChat *self = user_data; - GError *error; + GError *error = NULL; if (!tp_proxy_prepare_finish (source, result, &error)) { |