From 340ad9fc8af56b8835efa053cfee0471c370757b Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sat, 21 Apr 2012 09:10:12 +0300
Subject: [PATCH] * mug: make warning-free for gtk3 compilation

---
 toys/mug/mug-msg-view.c  | 11 +++++++++--
 toys/mug/mug-shortcuts.c |  7 +++++++
 toys/mug/mug.c           | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/toys/mug/mug-msg-view.c b/toys/mug/mug-msg-view.c
index 4a360f64..473d5097 100644
--- a/toys/mug/mug-msg-view.c
+++ b/toys/mug/mug-msg-view.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+** Copyright (C) 2008-2012 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by the
@@ -16,6 +16,7 @@
 ** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 **
 */
+#include <config.h>
 
 #include "mug-msg-view.h"
 #include "mu-msg.h"
@@ -161,7 +162,13 @@ headers_area (MugMsgViewPrivate * priv)
 	gtk_container_add (GTK_CONTAINER (priv->_expander),
 			   priv->_tableexpander);
 
-	vbox = gtk_vbox_new (FALSE, FALSE);
+
+#ifdef HAVE_GTK3
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#else
+	vbox = gtk_vbox_new (FALSE, 0);
+#endif /*!HAVE_GTK3 */
+
 	gtk_box_pack_start (GTK_BOX (vbox), priv->_tablemain, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->_expander, FALSE, FALSE, 0);
 
diff --git a/toys/mug/mug-shortcuts.c b/toys/mug/mug-shortcuts.c
index 0b39832f..2f4441e7 100644
--- a/toys/mug/mug-shortcuts.c
+++ b/toys/mug/mug-shortcuts.c
@@ -16,6 +16,7 @@
 ** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 **
 */
+#include <config.h>
 
 #include "mug-shortcuts.h"
 #include "mu-bookmarks.h"
@@ -82,7 +83,13 @@ mug_shortcuts_init (MugShortcuts * obj)
 {
 	obj->_priv = MUG_SHORTCUTS_GET_PRIVATE (obj);
 
+#ifdef HAVE_GTK3
+	obj->_priv->_bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
+#else
 	obj->_priv->_bbox = gtk_vbutton_box_new ();
+
+#endif /*!HAVE_GTK3 */
+
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (obj->_priv->_bbox),
 				   GTK_BUTTONBOX_START);
 	gtk_box_pack_start (GTK_BOX (obj), obj->_priv->_bbox, TRUE, TRUE, 0);
diff --git a/toys/mug/mug.c b/toys/mug/mug.c
index dbee1728..846c9c33 100644
--- a/toys/mug/mug.c
+++ b/toys/mug/mug.c
@@ -261,8 +261,14 @@ mug_query_area (MugData * mugdata)
 	GtkWidget *paned;
 	GtkWidget *scrolled;
 
+#ifdef HAVE_GTK3
+	queryarea = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+	paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+#else
 	queryarea = gtk_vbox_new (FALSE, 2);
 	paned = gtk_vpaned_new ();
+#endif /*!HAVE_GTK3 */
+
 
 	mugdata->mlist = mug_msg_list_view_new
 		(mu_runtime_path(MU_RUNTIME_PATH_XAPIANDB));
@@ -299,7 +305,12 @@ static GtkWidget *
 mug_main_area (MugData * mugdata)
 {
 	GtkWidget *mainarea, *w;
+
+#ifdef HAVE_GTK3
+	mainarea = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+#else
 	mainarea = gtk_hbox_new (FALSE, 5);
+#endif /*!HAVE_GTK3 */
 
 	w = mug_shortcuts_bar (mugdata);
 	gtk_box_pack_start (GTK_BOX (mainarea), w, FALSE, FALSE, 0);
@@ -320,7 +331,12 @@ mug_shell (MugData * mugdata)
 	mugdata->win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title (GTK_WINDOW (mugdata->win), "Mug Mail Search");
 
+#ifdef HAVE_GTK3
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+#else
 	vbox = gtk_vbox_new (FALSE, 2);
+#endif /*!HAVE_GTK3 */
+
 	mugdata->toolbar = mug_toolbar (mugdata);
 	gtk_box_pack_start (GTK_BOX (vbox), mugdata->toolbar, FALSE, FALSE, 2);
 	gtk_box_pack_start (GTK_BOX (vbox), mug_main_area (mugdata), TRUE,