cpw.nader.asynclogging-3: 1b132d75: Fixed the pidgin log window to properly ...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: 1b132d7543287542e1eb64783c43e88267c73c16
Parent:   d55884d4478d38142536c16c4d2668db13162112
Author:   morshed.nader at gmail.com
Date:     01/07/12 14:35:54
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/1b132d7543287542e1eb64783c43e88267c73c16

Changelog: 

Fixed the pidgin log window to properly hide the encompassing from of the webkit object

Changes against parent d55884d4478d38142536c16c4d2668db13162112

  patched  pidgin/gtklog.c

-------------- next part --------------
============================================================
--- pidgin/gtklog.c	d3f4b86555ba09ca175187626abf6b48921799f5
+++ pidgin/gtklog.c	2072929b53dec73ea5fcc213e201c4c06f446733
@@ -120,6 +120,7 @@ struct _PidginLogViewerPrivate {
 	GtkWidget          *icon;
 	gboolean           need_log_size;
 	GtkWidget          *title_box;
+	GtkWidget          *wv_frame;      /**< The frame containing the webview */
 #if GTK_CHECK_VERSION(2, 20, 0)
 	GtkWidget          *spinner;       /**< A spinner to indicate a read is in progress */
 #endif
@@ -784,7 +785,7 @@ pidgin_log_read_cb(GObject *object, GAsy
 #if GTK_CHECK_VERSION(2, 20, 0)
 		{
 			PidginLogViewerPrivate *priv = PIDGIN_LOG_VIEWER_GET_PRIVATE(lv);
-			gtk_widget_show(GTK_WIDGET(wv));
+			gtk_widget_show(priv->wv_frame);
 			gtk_widget_hide(priv->spinner);
 		}
 #endif
@@ -877,7 +878,7 @@ log_select_cb(GtkTreeSelection *sel, Pid
 #if GTK_CHECK_VERSION(2, 20, 0)
 	{
 		PidginLogViewerPrivate *priv = PIDGIN_LOG_VIEWER_GET_PRIVATE(lv);
-		gtk_widget_hide(priv->web_view);
+		gtk_widget_hide(priv->wv_frame);
 		gtk_widget_show(priv->spinner);
 	}
 #endif
@@ -2173,12 +2174,10 @@ pidgin_log_viewer_init(PidginLogViewer *
 	gtk_box_pack_start(GTK_BOX(content_area), priv->title_box, FALSE, FALSE, 0);
 
 
-	/* XXX: icon? */
-
 	/* Title Label */
 	priv->label = gtk_label_new(NULL);
 	gtk_misc_set_alignment(GTK_MISC(priv->label), 0, 0);
-	/* Pack in construction */
+	/* Pack the label in construction once we have the icon, too */
 	gtk_widget_show(priv->label);
 
 
@@ -2215,11 +2214,11 @@ pidgin_log_viewer_init(PidginLogViewer *
 
 
 	/* Viewer */
-	frame = pidgin_create_webview(FALSE, &priv->web_view, NULL, NULL);
+	priv->wv_frame = pidgin_create_webview(FALSE, &priv->web_view, NULL, NULL);
 	gtk_widget_set_name(priv->web_view, "pidgin_log_web_view");
 	gtk_widget_set_size_request(priv->web_view, 320, 200);
-	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
-	gtk_widget_show(frame);
+	gtk_box_pack_start(GTK_BOX(vbox), priv->wv_frame, TRUE, TRUE, 0);
+	gtk_widget_show(priv->wv_frame);
 
 	/* Spinner */
 #if GTK_CHECK_VERSION(2, 20, 0)