individual_view_drag_end: remove the auto scroll

[empathy.git] / libempathy-gtk / empathy-presence-chooser.c

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 33bf02811bf37a47954e5ca7444c49c321384d01..948a0a7bde21975d1551a1fe2926b2bad7e8047f 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -37,7 +37,7 @@
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-connectivity.h>
-#include <libempathy/empathy-idle.h>
+#include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-status-presets.h>
 
@@ -66,9 +66,6 @@
  * Widget which extends #GtkComboBoxEntry to change presence.
  */
 
-/* Flashing delay for icons (milliseconds). */
-#define FLASH_TIMEOUT 500
-
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPresenceChooser)
 
 /* For custom message dialog */
@@ -99,7 +96,7 @@ typedef enum  {
 } PresenceChooserEntryType;
 
 typedef struct {
-       EmpathyIdle *idle;
+       EmpathyPresenceManager *presence_mgr;
        EmpathyConnectivity *connectivity;
 
        gboolean     editing_status;
@@ -433,7 +430,7 @@ mc_set_custom_state (EmpathyPresenceChooser *self)
 
        DEBUG ("Sending state to MC-> %d (%s)", priv->state, status);
 
-       empathy_idle_set_presence (priv->idle, priv->state, status);
+       empathy_presence_manager_set_presence (priv->presence_mgr, priv->state, status);
 }
 
 static void
@@ -444,6 +441,7 @@ ui_set_custom_state (EmpathyPresenceChooser *self,
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
        GtkWidget *entry;
        const char *icon_name;
+       const gchar *status_tooltip;
 
        entry = gtk_bin_get_child (GTK_BIN (self));
 
@@ -454,7 +452,9 @@ ui_set_custom_state (EmpathyPresenceChooser *self,
        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
                                           GTK_ENTRY_ICON_PRIMARY,
                                           icon_name);
-       gtk_entry_set_text (GTK_ENTRY (entry), status == NULL ? "" : status);
+       status_tooltip = status == NULL ? "" : status;
+       gtk_entry_set_text (GTK_ENTRY (entry), status_tooltip);
+       gtk_widget_set_tooltip_text (GTK_WIDGET (entry), status_tooltip);
        presence_chooser_set_favorite_icon (self);
 
        priv->block_changed--;
@@ -482,11 +482,9 @@ presence_chooser_entry_icon_release_cb (EmpathyPresenceChooser *self,
                mc_set_custom_state (self);
        }
        else {
-               PresenceChooserEntryType type;
                TpConnectionPresenceType state;
                char *status;
 
-               type = presence_chooser_get_entry_type (self);
                state = get_state_and_status (self, &status);
 
                if (!empathy_status_presets_is_valid (state)) {
@@ -664,7 +662,7 @@ presence_chooser_changed_cb (GtkComboBox *self, gpointer user_data)
                                    COL_STATUS_TEXT, &status,
                                    -1);
 
-               empathy_idle_set_presence (priv->idle, priv->state, status);
+               empathy_presence_manager_set_presence (priv->presence_mgr, priv->state, status);
 
                g_free (status);
        }
@@ -747,7 +745,7 @@ update_sensitivity_am_prepared_cb (GObject *source_object,
        GList *accounts, *l;
        GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+       if (!tp_proxy_prepare_finish (manager, result, &error)) {
                DEBUG ("Failed to prepare account manager: %s", error->message);
                g_error_free (error);
                return;
@@ -779,7 +777,7 @@ presence_chooser_update_sensitivity (EmpathyPresenceChooser *chooser)
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
 
-       tp_account_manager_prepare_async (priv->account_manager, NULL,
+       tp_proxy_prepare_async (priv->account_manager, NULL,
                                          update_sensitivity_am_prepared_cb,
                                          chooser);
 }
@@ -864,6 +862,7 @@ presence_chooser_constructed (GObject *object)
        EmpathyPresenceChooserPriv *priv = chooser->priv;
        GtkWidget *entry;
        GtkCellRenderer *renderer;
+       const gchar *status_tooltip;
 
        tp_g_signal_connect_object (gtk_icon_theme_get_default (), "changed",
                                     G_CALLBACK (icon_theme_changed_cb),
@@ -922,7 +921,7 @@ presence_chooser_constructed (GObject *object)
                        G_CALLBACK (presence_chooser_entry_focus_out_cb),
                        chooser);
 
-       priv->idle = empathy_idle_dup_singleton ();
+       priv->presence_mgr = empathy_presence_manager_dup_singleton ();
 
        priv->account_manager = tp_account_manager_dup ();
        g_signal_connect_swapped (priv->account_manager,
@@ -943,9 +942,8 @@ presence_chooser_constructed (GObject *object)
                G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
                chooser, 0);
 
-       /* FIXME: this string sucks */
-       gtk_widget_set_tooltip_text (GTK_WIDGET (chooser),
-               _("Set your presence and current status"));
+       status_tooltip = gtk_entry_get_text (GTK_ENTRY (entry));
+       gtk_widget_set_tooltip_text (GTK_WIDGET (chooser), status_tooltip);
 
        priv->connectivity = empathy_connectivity_dup_singleton ();
        tp_g_signal_connect_object (priv->connectivity,
@@ -970,10 +968,10 @@ presence_chooser_finalize (GObject *object)
        if (priv->account_manager != NULL)
                g_object_unref (priv->account_manager);
 
-       g_signal_handlers_disconnect_by_func (priv->idle,
+       g_signal_handlers_disconnect_by_func (priv->presence_mgr,
                                              presence_chooser_presence_changed_cb,
                                              object);
-       g_object_unref (priv->idle);
+       g_object_unref (priv->presence_mgr);
 
        g_object_unref (priv->connectivity);
        if (priv->not_favorite_pixbuf != NULL)
@@ -1080,6 +1078,7 @@ presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
              GTK_ENTRY_ICON_PRIMARY,
              empathy_icon_name_for_presence (state));
+       gtk_widget_set_tooltip_text (GTK_WIDGET (entry), status);
 
        entry = gtk_bin_get_child (GTK_BIN (chooser));
        gtk_editable_set_editable (GTK_EDITABLE (entry),
@@ -1197,11 +1196,11 @@ static void
 presence_chooser_set_state (TpConnectionPresenceType state,
                            const gchar *status)
 {
-       EmpathyIdle *idle;
+       EmpathyPresenceManager *presence_mgr;
 
-       idle = empathy_idle_dup_singleton ();
-       empathy_idle_set_presence (idle, state, status);
-       g_object_unref (idle);
+       presence_mgr = empathy_presence_manager_dup_singleton ();
+       empathy_presence_manager_set_presence (presence_mgr, state, status);
+       g_object_unref (presence_mgr);
 }
 
 static void