/pidgin/main: 8e72593def2c: Fix gtk_[hv]box_new gtk3 deprecation...

[Ankit Vani]

Changeset: 8e72593def2c1712ec1db440951c17ecda66e50d
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-12 10:14 +0530
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/8e72593def2c

Description:

Fix gtk_[hv]box_new gtk3 deprecation warnings in unity plugin

diffstat:

 pidgin/gtk3compat.h    |   2 ++
 pidgin/plugins/unity.c |  11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (62 lines):

diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h
--- a/pidgin/gtk3compat.h
+++ b/pidgin/gtk3compat.h
@@ -31,6 +31,8 @@
  * Also, any public API should not depend on this file.
  */
 
+#include <gtk/gtk.h>
+
 #if !GTK_CHECK_VERSION(3,2,0)
 
 #define GTK_FONT_CHOOSER GTK_FONT_SELECTION_DIALOG
diff --git a/pidgin/plugins/unity.c b/pidgin/plugins/unity.c
--- a/pidgin/plugins/unity.c
+++ b/pidgin/plugins/unity.c
@@ -17,10 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
-#include "version.h"
 #include "account.h"
 #include "savedstatuses.h"
+#include "version.h"
 
+#include "gtk3compat.h"
 #include "gtkplugin.h"
 #include "gtkconv.h"
 #include "gtkutils.h"
@@ -431,13 +432,13 @@ get_config_frame(PurplePlugin *plugin)
 	GtkWidget *ret = NULL, *frame = NULL;
 	GtkWidget *vbox = NULL, *toggle = NULL;
 
-	ret = gtk_vbox_new(FALSE, 18);
+	ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
 	gtk_container_set_border_width(GTK_CONTAINER (ret), 12);
 
 	/* Alerts */
 
 	frame = pidgin_make_frame(ret, _("Chatroom alerts"));
-	vbox = gtk_vbox_new(FALSE, 5);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
 	toggle = gtk_check_button_new_with_mnemonic(_("Chatroom message alerts _only where someone says your username"));
@@ -450,7 +451,7 @@ get_config_frame(PurplePlugin *plugin)
 	/* Launcher integration */
 
 	frame = pidgin_make_frame(ret, _("Launcher Icon"));
-	vbox = gtk_vbox_new(FALSE, 5);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
 	toggle = gtk_radio_button_new_with_mnemonic(NULL, _("_Disable launcher integration"));
@@ -479,7 +480,7 @@ get_config_frame(PurplePlugin *plugin)
 	/* Messaging menu integration */
 
 	frame = pidgin_make_frame(ret, _("Messaging Menu"));
-	vbox = gtk_vbox_new(FALSE, 5);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
 	toggle = gtk_radio_button_new_with_mnemonic(NULL,