[balsa/gtk3] Use GtkBox packing instead of the event-box
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Use GtkBox packing instead of the event-box
- Date: Mon, 24 Jan 2011 02:56:43 +0000 (UTC)
commit 5fc4d4c9d948a71e14bae93f7f069f6021f4eded
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Fri Jan 21 19:13:27 2011 -0500
Use GtkBox packing instead of the event-box
* libbalsa/html.c (lbh_show_info_bar), (libbalsa_html_new): use
GtkBox packing instead of the event-box.
ChangeLog | 5 +++++
libbalsa/html.c | 15 ++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a854882..6d21f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-01-21 Peter Bloomfield
+ * libbalsa/html.c (lbh_show_info_bar), (libbalsa_html_new): use
+ GtkBox packing instead of the event-box.
+
+2011-01-21 Peter Bloomfield
+
* libbalsa/html.c (lbh_info_bar_response_cb), (lbh_show_info_bar),
(lbh_resource_request_starting_cb), (libbalsa_html_new): put
info-bar in an event-box, and only when needed.
diff --git a/libbalsa/html.c b/libbalsa/html.c
index ccabfc8..dbba62c 100644
--- a/libbalsa/html.c
+++ b/libbalsa/html.c
@@ -93,7 +93,7 @@ typedef struct {
LibBalsaHtmlCallback clicked_cb;
WebKitWebFrame *frame;
gboolean download_images;
- GtkWidget *info_bar_box;
+ GtkWidget *vbox;
gboolean has_info_bar;
WebKitWebView *web_view;
} LibBalsaWebKitInfo;
@@ -206,7 +206,8 @@ lbh_show_info_bar(LibBalsaWebKitInfo * info)
GTK_RESPONSE_OK,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
- gtk_container_add(GTK_CONTAINER(info->info_bar_box), info_bar_widget);
+ gtk_box_pack_start(GTK_BOX(info->vbox), info_bar_widget,
+ FALSE, FALSE, 0);
info_bar = GTK_INFO_BAR(info_bar_widget);
@@ -376,21 +377,17 @@ libbalsa_html_new(LibBalsaMessageBody * body,
if (len < 0)
return NULL;
- vbox = gtk_vbox_new(FALSE, 0);
-
- widget = webkit_web_view_new();
-
info = g_new(LibBalsaWebKitInfo, 1);
info->body = body;
info->hover_cb = hover_cb;
info->clicked_cb = clicked_cb;
info->frame = NULL;
info->download_images = FALSE;
- info->info_bar_box = gtk_event_box_new();
info->has_info_bar = FALSE;
+ info->vbox = vbox = gtk_vbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), info->info_bar_box, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
+ widget = webkit_web_view_new();
+ gtk_box_pack_end(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
info->web_view = web_view = WEBKIT_WEB_VIEW(widget);
g_object_set_data(G_OBJECT(vbox), "libbalsa-html-web-view", web_view);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]