From a05517d865e823e5bd939ae5efcc497ccadef066 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Mon, 15 Nov 2010 12:31:36 +0100 Subject: Add a close button to Previous Conversations https://bugzilla.gnome.org/show_bug.cgi?id=595305 --- libempathy-gtk/empathy-log-window.c | 11 +++++++ libempathy-gtk/empathy-log-window.ui | 58 +++++++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index aa0370b94..9f6006473 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -96,6 +96,8 @@ static void log_window_button_next_clicked_cb (GtkWidget *wi EmpathyLogWindow *window); static void log_window_button_previous_clicked_cb (GtkWidget *widget, EmpathyLogWindow *window); +static void log_window_button_close_clicked_cb (GtkWidget *widget, + EmpathyLogWindow *window); static void log_window_chats_changed_cb (GtkTreeSelection *selection, EmpathyLogWindow *window); static void log_window_chats_populate (EmpathyLogWindow *window); @@ -263,6 +265,8 @@ empathy_log_window_show (TpAccount *account, "entry_find", "activate", log_window_entry_find_activate_cb, "button_previous", "clicked", log_window_button_previous_clicked_cb, "button_next", "clicked", log_window_button_next_clicked_cb, + "button_close", "clicked", log_window_button_close_clicked_cb, + "button_close2", "clicked", log_window_button_close_clicked_cb, "button_find", "clicked", log_window_button_find_clicked_cb, "entry_chats", "changed", log_window_entry_chats_changed_cb, "entry_chats", "activate", log_window_entry_chats_activate_cb, @@ -759,6 +763,13 @@ log_window_button_previous_clicked_cb (GtkWidget *widget, } } +static void +log_window_button_close_clicked_cb (GtkWidget *widget, + EmpathyLogWindow *window) +{ + gtk_widget_destroy (window->window); +} + /* * Chats Code */ diff --git a/libempathy-gtk/empathy-log-window.ui b/libempathy-gtk/empathy-log-window.ui index 5ce930095..1f99cddf0 100644 --- a/libempathy-gtk/empathy-log-window.ui +++ b/libempathy-gtk/empathy-log-window.ui @@ -155,6 +155,22 @@ 1 + + + gtk-close + True + True + True + True + False + + + False + False + end + 0 + + False @@ -173,6 +189,12 @@ 1 + + + + + + @@ -188,7 +210,7 @@ True 12 - 2 + 3 2 6 6 @@ -297,6 +319,40 @@ GTK_FILL + + + True + 12 + + + + + + gtk-close + True + True + True + True + + + False + False + end + 1 + + + + + 1 + 2 + 2 + 3 + + + + + + 1 -- cgit v1.2.3