include telepathy-glib.h

[empathy.git] / src / empathy-status-icon.c

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index d6f5b2e4627d7e602718f4d7da32efed2589a328..b26b925c818ea74d3a4b6f501dd9a67cd16d3680 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -29,8 +29,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
@@ -320,7 +319,9 @@ static void
 status_icon_quit_cb (GtkAction         *action,
                     EmpathyStatusIcon *icon)
 {
-       gtk_main_quit ();
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+
+       gtk_widget_destroy (priv->window);
 }
 
 static void
@@ -443,13 +444,13 @@ account_manager_prepared_cb (GObject *source_object,
                return;
        }
 
-       list = tp_account_manager_get_valid_accounts (account_manager);
+       list = tp_account_manager_dup_valid_accounts (account_manager);
        for (l = list; l != NULL; l = l->next) {
                tp_g_signal_connect_object (l->data, "status-changed",
                                             G_CALLBACK (status_icon_status_changed_cb),
                                             icon, 0);
        }
-       g_list_free (list);
+       g_list_free_full (list, g_object_unref);
 
        status_icon_presence_changed_cb (icon);
 }