/pidgin/main: 2fe4dec70301: Remove deprecated GtkAlignment.

Changeset: 2fe4dec7030164f6af6db77035a94a2941398be6
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2016-09-03 20:15 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/2fe4dec70301

Description:

Remove deprecated GtkAlignment.

diffstat:

 pidgin/gtkxfer.c           |  12 ++++++++++++
 pidgin/plugins/screencap.c |   5 +++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diffs (54 lines):

diff --git a/pidgin/gtkxfer.c b/pidgin/gtkxfer.c
--- a/pidgin/gtkxfer.c
+++ b/pidgin/gtkxfer.c
@@ -711,7 +711,9 @@ pidgin_xfer_dialog_new(void)
 	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 @@ pidgin_xfer_dialog_new(void)
 
 	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 @@ pidgin_xfer_dialog_new(void)
 	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));
 
diff --git a/pidgin/plugins/screencap.c b/pidgin/plugins/screencap.c
--- a/pidgin/plugins/screencap.c
+++ b/pidgin/plugins/screencap.c
@@ -391,8 +391,13 @@ scrncap_draw_window(PidginWebView *webvi
 	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);

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits