Merge remote-tracking branch 'origin/gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-chat.c

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 1c0e11a3a92f80c0b5e898cd1abd2b08c9f590a5..63364b3a2dc0912a30d2c8933ca0268d0a917621 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,42 +26,33 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include <config.h>
 /* for GCompletion */
 #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
+#include "empathy-chat.h"
 
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-logger/telepathy-logger.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-keyring.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-client-factory.h>
 
-#include "empathy-chat.h"
-#include "empathy-spell.h"
+#include "empathy-client-factory.h"
+#include "empathy-gsettings.h"
 #include "empathy-individual-information-dialog.h"
 #include "empathy-individual-store-channel.h"
 #include "empathy-individual-view.h"
 #include "empathy-input-text-view.h"
+#include "empathy-keyring.h"
+#include "empathy-request-util.h"
 #include "empathy-search-bar.h"
-#include "empathy-theme-manager.h"
-#include "empathy-theme-adium.h"
 #include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
+#include "empathy-spell.h"
 #include "empathy-string-parser.h"
-#include "extensions/extensions.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
 #define COMPOSING_STOP_TIMEOUT 5
@@ -3864,14 +3855,8 @@ provide_password_cb (GObject *tp_chat,
                return;
        }
 
-       if (empathy_keyring_is_available ()) {
-               /* ask whether they want to save the password */
-               chat_prompt_to_save_password (self, data);
-       } else {
-               /* Get rid of the password info bar finally */
-               gtk_widget_destroy (data->info_bar);
-               g_slice_free (PasswordData, data);
-       }
+    /* ask whether they want to save the password */
+    chat_prompt_to_save_password (self, data);
 
        /* Room joined */
        gtk_widget_set_sensitive (priv->hpaned, TRUE);