Mercurial > pidgin3 / changeset

--- a/pidgin/gtkxfer.c	Sat Sep 03 18:48:09 2016 -0400
+++ b/pidgin/gtkxfer.c	Sat Sep 03 20:15:15 2016 -0400
@@ -711,7 +711,9 @@
 	GtkWidget *window;
 	GtkWidget *vbox;
 	GtkWidget *expander;
+#if !GTK_CHECK_VERSION(3,14,0)
 	GtkWidget *alignment;
+#endif
 	GtkWidget *grid;
 	GtkWidget *checkbox;
 	GtkWidget *bbox;
@@ -765,6 +767,15 @@
 
 	gtk_widget_set_sensitive(expander, FALSE);
 
+#if GTK_CHECK_VERSION(3,14,0)
+	/* The grid of information. */
+	grid = make_info_grid(dialog);
+	gtk_container_add(GTK_CONTAINER(expander), grid);
+	gtk_widget_show(grid);
+
+	/* Small indent make grid fall under GtkExpander's label */
+	gtk_widget_set_margin_start(grid, 20);
+#else
 	/* Small indent make grid fall under GtkExpander's label */
 	alignment = gtk_alignment_new(1, 0, 1, 1);
 	gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 20, 0);
@@ -775,6 +786,7 @@
 	grid = make_info_grid(dialog);
 	gtk_container_add(GTK_CONTAINER(alignment), grid);
 	gtk_widget_show(grid);
+#endif
 
 	bbox = pidgin_dialog_get_action_area(GTK_DIALOG(window));
 

--- a/pidgin/plugins/screencap.c	Sat Sep 03 18:48:09 2016 -0400
+++ b/pidgin/plugins/screencap.c	Sat Sep 03 20:15:15 2016 -0400
@@ -391,8 +391,13 @@
 	g_signal_connect(G_OBJECT(drawing_area), "leave-notify-event",
 		G_CALLBACK(scrncap_drawing_area_leave), draw_cursor);
 
+#if GTK_CHECK_VERSION(3,14,0)
+	box = drawing_area;
+	g_object_set(drawing_area, "xalign", 0.5, "yalign", 0.5, NULL);
+#else
 	box = gtk_alignment_new(0.5, 0.5, 0, 0);
 	gtk_container_add(GTK_CONTAINER(box), drawing_area);
+#endif
 	scroll_area = pidgin_make_scrollable(box,
 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC,
 		GTK_SHADOW_NONE, -1, -1);