Merge branch 'gnome-3-8'

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

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 38a68d43320bb1bf8cea1827a7599530cb43e51a..917fab3831364fa7b50e235084260ee08e502a72 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -19,35 +19,19 @@
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include <config.h>
-
-#include <string.h>
-
-#include <glib.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
-#include <libempathy-gtk/empathy-new-call-dialog.h>
-
-#include "empathy-accounts-dialog.h"
+#include "config.h"
 #include "empathy-status-icon.h"
-#include "empathy-preferences.h"
+
 #include "empathy-event-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Number of ms to wait when blinking */
 #define BLINK_TIMEOUT 500
@@ -62,7 +46,7 @@ typedef struct {
        EmpathyEvent        *event;
        GSettings           *gsettings_ui;
 
-       GtkWindow           *window;
+       GtkWidget           *window;
        GtkUIManager        *ui_manager;
        GtkWidget           *popup_menu;
        GtkAction           *show_window_item;
@@ -222,7 +206,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
        }
 
        if (!visible) {
-               empathy_window_iconify (priv->window, priv->icon);
+               gtk_widget_hide (priv->window);
        } else {
                empathy_window_present (GTK_WINDOW (priv->window));
        }
@@ -246,7 +230,7 @@ status_icon_toggle_visibility (EmpathyStatusIcon *icon)
        EmpathyStatusIconPriv *priv = GET_PRIV (icon);
        gboolean               visible;
 
-       visible = gtk_window_is_active (priv->window);
+       visible = gtk_window_is_active (GTK_WINDOW (priv->window));
        status_icon_set_visibility (icon, !visible, TRUE);
 }
 
@@ -320,7 +304,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
@@ -334,7 +320,7 @@ status_icon_popup_menu_cb (GtkStatusIcon     *status_icon,
        GtkWidget             *submenu;
        gboolean               show;
 
-       show = empathy_window_get_is_visible (GTK_WINDOW (priv->window));
+       show = gtk_widget_get_visible (priv->window);
 
        g_signal_handlers_block_by_func (priv->show_window_item,
                                         status_icon_show_hide_window_cb,
@@ -437,19 +423,19 @@ account_manager_prepared_cb (GObject *source_object,
        EmpathyStatusIcon *icon = user_data;
        GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+       if (!tp_proxy_prepare_finish (account_manager, result, &error)) {
                DEBUG ("Failed to prepare account manager: %s", error->message);
                g_error_free (error);
                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);
 }
@@ -465,7 +451,7 @@ empathy_status_icon_init (EmpathyStatusIcon *icon)
        priv->account_manager = tp_account_manager_dup ();
        priv->event_manager = empathy_event_manager_dup_singleton ();
 
-       tp_account_manager_prepare_async (priv->account_manager, NULL,
+       tp_proxy_prepare_async (priv->account_manager, NULL,
            account_manager_prepared_cb, icon);
 
        /* make icon listen and respond to MAIN_WINDOW_HIDDEN changes */