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 45dd9da9ea5bd9cf8ab3753d7ce595d0ce372a69..948a0a7bde21975d1551a1fe2926b2bad7e8047f 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -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 */
@@ -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--;
@@ -745,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;
@@ -777,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);
 }
@@ -862,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),
@@ -941,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,
@@ -1078,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),