diff options
| author | Travis Reitter <treitter@gmail.com> | 2010-07-15 04:55:07 +0800 |
|---|---|---|
| committer | Travis Reitter <treitter@gmail.com> | 2010-07-22 00:03:37 +0800 |
| commit | da5ec3c2bf5f816cff03932d23aec183beb18ee5 (patch) | |
| tree | 1b9946b44dc4e085d3c8afd06b0d75d9c29ee64f /libempathy-gtk/empathy-individual-menu.c | |
| parent | 5ee7ffd39ff228c35d0fb85aa7d55bbfe044e73f (diff) | |
| download | gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.gz gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.bz2 gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.lz gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.xz gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.zst gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.zip | |
Merge remote branch 'pwith/folks-integ-rebase1-fixes-rebase1' into folks-fixes
Diffstat (limited to 'libempathy-gtk/empathy-individual-menu.c')
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index fcac824b7..72ea1b80b 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -143,7 +143,6 @@ empathy_individual_menu_new (FolksIndividual *individual, gtk_widget_show (item); } -#if HAVE_FAVOURITE_CONTACTS /* Favorite checkbox */ if (features & EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE) { @@ -151,7 +150,6 @@ empathy_individual_menu_new (FolksIndividual *individual, gtk_menu_shell_append (shell, item); gtk_widget_show (item); } -#endif return menu; } @@ -175,7 +173,7 @@ empathy_individual_add_menu_item_new (FolksIndividual *individual) { GtkWidget *item; GtkWidget *image; - EmpathyIndividualManager *manager; + EmpathyIndividualManager *manager = NULL; EmpathyContact *contact = NULL; TpConnection *connection; GList *l, *members; @@ -215,7 +213,6 @@ empathy_individual_add_menu_item_new (FolksIndividual *individual) } } g_list_free (members); - g_object_unref (manager); if (found) { @@ -233,6 +230,7 @@ empathy_individual_add_menu_item_new (FolksIndividual *individual) out: tp_clear_object (&contact); + tp_clear_object (&manager); return item; } |