Merge branch 'undo-close-tab'

[empathy.git] / src / empathy-main-window.c

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 635627e742c865a6240389858c99223ba67e71e1..031e23d07f9ae0d39f0cef7c8308fd8df124e56d 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -25,6 +25,7 @@
 
 #include <sys/stat.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
 #include <telepathy-glib/account-manager.h>
@@ -53,6 +54,7 @@
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-accounts-dialog.h"
+#include "empathy-chat-manager.h"
 #include "empathy-main-window.h"
 #include "ephy-spinner.h"
 #include "empathy-preferences.h"
@@ -662,6 +664,23 @@ main_window_destroy_cb (GtkWidget         *widget,
        g_free (window);
 }
 
+static gboolean
+main_window_key_press_event_cb  (GtkWidget *window,
+                                GdkEventKey *event,
+                                gpointer user_data)
+{
+       EmpathyChatManager *chat_manager;
+
+       if (event->keyval == GDK_T
+           && event->state & GDK_SHIFT_MASK
+           && event->state & GDK_CONTROL_MASK) {
+               chat_manager = empathy_chat_manager_dup_singleton ();
+               empathy_chat_manager_undo_closed_chat (chat_manager);
+               g_object_unref (chat_manager);
+       }
+       return FALSE;
+}
+
 static void
 main_window_chat_quit_cb (GtkAction         *action,
                          EmpathyMainWindow *window)
@@ -1338,6 +1357,7 @@ empathy_main_window_show (void)
 
        empathy_builder_connect (gui, window,
                              "main_window", "destroy", main_window_destroy_cb,
+                             "main_window", "key-press-event", main_window_key_press_event_cb,
                              "chat_quit", "activate", main_window_chat_quit_cb,
                              "chat_new_message", "activate", main_window_chat_new_message_cb,
                              "chat_new_call", "activate", main_window_chat_new_call_cb,