[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-85-g9d818b9

[ticho at claws-mail.org]

The branch, gtk3 has been updated
       via  9d818b9d27d0c64dc6d02be18408daa13ab454f4 (commit)
       via  d5783e342aa3661614bc9d97f790db0f0abcf95f (commit)
      from  c00851f6dd8e3e4beb363d4c7504bf90e46ea7e2 (commit)

Summary of changes:
 src/noticeview.c                 |   38 +++++++++++++++++++++++---------------
 src/noticeview.h                 |    4 ++--
 src/plugins/dillo/dillo_viewer.c |    2 +-
 3 files changed, 26 insertions(+), 18 deletions(-)


- Log -----------------------------------------------------------------
commit 9d818b9d27d0c64dc6d02be18408daa13ab454f4
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Feb 15 18:57:29 2018 +0100

    GTK_WINDOW_XWINDOW() to GTK_WINDOW_XID() in dillo.

diff --git a/src/plugins/dillo/dillo_viewer.c b/src/plugins/dillo/dillo_viewer.c
index 87ec133..1b4efab 100644
--- a/src/plugins/dillo/dillo_viewer.c
+++ b/src/plugins/dillo/dillo_viewer.c
@@ -150,7 +150,7 @@ static void dillo_show_mimepart(MimeViewer *_viewer,
 		cmd = g_strdup_printf("dillo %s%s-x %d \"%s\"",
 				      (!load_images(viewer) ? "-l " : ""),
 				      (dillo_prefs.full ? "-f " : ""),
-				      (gint) GDK_WINDOW_XWINDOW(gdkwin),
+				      (gint) GDK_WINDOW_XID(gdkwin),
 				      viewer->filename);
 
 		execute_command_line(cmd, TRUE, NULL);

commit d5783e342aa3661614bc9d97f790db0f0abcf95f
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Feb 15 18:56:39 2018 +0100

    GtkBox to GtkGrid in noticeview.c

diff --git a/src/noticeview.c b/src/noticeview.c
index edea73f..60c51b0 100644
--- a/src/noticeview.c
+++ b/src/noticeview.c
@@ -71,9 +71,9 @@ static void set_hand_cursor(GdkWindow *window)
 NoticeView *noticeview_create(MainWindow *mainwin)
 {
 	NoticeView *noticeview;
-	GtkWidget  *vbox;
+	GtkWidget  *vgrid;
 	GtkWidget  *hsep;
-	GtkWidget  *hbox;
+	GtkWidget  *hgrid;
 	GtkWidget  *icon;
 	GtkWidget  *text;
 	GtkWidget  *widget;
@@ -84,15 +84,22 @@ NoticeView *noticeview_create(MainWindow *mainwin)
 	noticeview = g_new0(NoticeView, 1);
 
 	noticeview->window = mainwin->window;
-	
-	vbox = gtk_vbox_new(FALSE, 4);
-	gtk_widget_show(vbox);
+
+	vgrid = gtk_grid_new();
+	gtk_orientable_set_orientation(GTK_ORIENTABLE(vgrid),
+			GTK_ORIENTATION_VERTICAL);
+	gtk_grid_set_row_spacing(GTK_GRID(vgrid), 4);
+	gtk_widget_show(vgrid);
 	hsep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
-	gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, TRUE, 1);
+	g_object_set(hsep, "margin", 1, NULL);
+	gtk_container_add(GTK_CONTAINER(vgrid), hsep);
 	
-	hbox = gtk_hbox_new(FALSE, 4);
-	gtk_widget_show(hbox);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 1);
+	hgrid = gtk_grid_new();
+	gtk_orientable_set_orientation(GTK_ORIENTABLE(hgrid),
+			GTK_ORIENTATION_HORIZONTAL);
+	gtk_widget_show(hgrid);
+	g_object_set(hgrid, "margin", 1, NULL);
+	gtk_container_add(GTK_CONTAINER(vgrid), hgrid);
 
 	evtbox = gtk_event_box_new();
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(evtbox), FALSE);
@@ -112,27 +119,28 @@ NoticeView *noticeview_create(MainWindow *mainwin)
 			 G_CALLBACK(noticeview_enter_notify), noticeview);
 	
 	gtk_container_add(GTK_CONTAINER(evtbox), icon);
-	gtk_box_pack_start(GTK_BOX(hbox), evtbox, FALSE, TRUE, 0);
+	gtk_container_add(GTK_CONTAINER(hgrid), evtbox);
 	
 	text = gtk_label_new("");
 	gtk_widget_show(text);
-	gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(hgrid), text);
 
 	widget = gtk_button_new_with_label("");
 	g_signal_connect(G_OBJECT(widget), "clicked", 
 			 G_CALLBACK(noticeview_button_pressed),
 			 (gpointer) noticeview);
-	gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 4);
+	g_object_set(widget, "margin", 4, NULL);
+	gtk_container_add(GTK_CONTAINER(hgrid), widget);
 	
 	widget2 = gtk_button_new_with_label("");
 	g_signal_connect(G_OBJECT(widget2), "clicked", 
 			 G_CALLBACK(noticeview_2ndbutton_pressed),
 			 (gpointer) noticeview);
-	gtk_box_pack_start(GTK_BOX(hbox), widget2, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(hgrid), widget2);
 	
-	noticeview->vbox   = vbox;
+	noticeview->vgrid   = vgrid;
 	noticeview->hsep   = hsep;
-	noticeview->hbox   = hbox;
+	noticeview->hgrid   = hgrid;
 	noticeview->icon   = icon;
 	noticeview->text   = text;
 	noticeview->button = widget;
diff --git a/src/noticeview.h b/src/noticeview.h
index bc380e7..9622ef7 100644
--- a/src/noticeview.h
+++ b/src/noticeview.h
@@ -25,9 +25,9 @@
 
 struct _NoticeView 
 {
-	GtkWidget	*vbox;
+	GtkWidget	*vgrid;
 	GtkWidget	*hsep;
-	GtkWidget	*hbox;
+	GtkWidget	*hgrid;
 	GtkWidget	*icon;
 	GtkWidget	*text;
 	GtkWidget	*button;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail