/dev/tomkiewicz/new-smileys: 3fc93e539e20: Smiley toolbar: fix f...

[Tomasz Wasilczyk]

Changeset: 3fc93e539e20b2a0cd6fdd561114a7d700f5fd64
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-04 11:29 +0200
Branch:	 default
URL: https://hg.pidgin.im/dev/tomkiewicz/new-smileys/rev/3fc93e539e20

Description:

Smiley toolbar: fix focus issues when opening manager window

diffstat:

 pidgin/gtkwebviewtoolbar.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (30 lines):

diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c
+++ b/pidgin/gtkwebviewtoolbar.c
@@ -854,6 +854,15 @@ add_smiley_list(PidginWebViewToolbar *to
 }
 
 static void
+insert_smiley_manage_cb(GtkButton *button, gpointer _dialog)
+{
+	GtkWidget *dialog = _dialog;
+
+	gtk_widget_destroy(dialog);
+	pidgin_smiley_manager_show();
+}
+
+static void
 insert_smiley_cb(GtkAction *smiley, PidginWebViewToolbar *toolbar)
 {
 	PidginWebViewToolbarPriv *priv =
@@ -928,9 +937,7 @@ insert_smiley_cb(GtkAction *smiley, Pidg
 				_("_Manage custom smileys"));
 			GtkRequisition req;
 			g_signal_connect(G_OBJECT(manage), "clicked",
-				G_CALLBACK(pidgin_smiley_manager_show), NULL);
-			g_signal_connect_swapped(G_OBJECT(manage), "clicked",
-				G_CALLBACK(gtk_widget_destroy), dialog);
+				G_CALLBACK(insert_smiley_manage_cb), dialog);
 			gtk_box_pack_end(GTK_BOX(vbox), manage, FALSE, TRUE, 0);
 			gtk_widget_get_preferred_size(manage, NULL, &req);
 			button_width = req.width;