Attachment 112812 Details for Bug 88788 – [glib] Remove use of deprecated GtkAlignment from demo/annots.c

[patch] [glib] Remove use of deprecated GtkAlignment from demo/annots.c

glib-Remove-use-of-deprecated-GtkAlignment-from-de.patch (text/plain), 2.06 KB, created by Hib Eris on 2015-01-25 18:06:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2015-01-25 18:06:14 UTC

Size: 2.06 KB

patch

obsolete

>From b639570ce70128a553c2c15e1501c38ae5799c14 Mon Sep 17 00:00:00 2001
>From: Hib Eris <hib@hiberis.nl>
>Date: Sun, 25 Jan 2015 13:23:34 +0100
>Subject: [PATCH] [glib] Remove use of deprecated GtkAlignment from
> demo/annots.c
>
>https://bugs.freedesktop.org/show_bug.cgi?id=88788
>---
> glib/demo/annots.c | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
>diff --git a/glib/demo/annots.c b/glib/demo/annots.c
>index 168575e..13f1bc8 100644
>--- a/glib/demo/annots.c
>+++ b/glib/demo/annots.c
>@@ -619,27 +619,30 @@ static void
> pgd_annot_view_set_annot (PgdAnnotsDemo *demo,
>                           PopplerAnnot  *annot)
> {
>-    GtkWidget  *alignment;
>     GtkWidget  *table;
>     gint        row = 0;
>     gchar      *text;
>     time_t      timet;
>     PopplerRectangle rect;
> 
>-    alignment = gtk_bin_get_child (GTK_BIN (demo->annot_view));
>-    if (alignment) {
>-        gtk_container_remove (GTK_CONTAINER (demo->annot_view), alignment);
>+    table = gtk_bin_get_child (GTK_BIN (demo->annot_view));
>+    if (table) {
>+        gtk_container_remove (GTK_CONTAINER (demo->annot_view), table);
>     }
> 
>-    alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
>-    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 8, 5);
>-    gtk_container_add (GTK_CONTAINER (demo->annot_view), alignment);
>-    gtk_widget_show (alignment);
>-
>     if (!annot)
>         return;
> 
>     table = gtk_grid_new ();
>+    gtk_widget_set_margin_top (table, 5);
>+    gtk_widget_set_margin_bottom (table, 5);
>+#if GTK_CHECK_VERSION(3, 12, 0)
>+    gtk_widget_set_margin_start (table, 8);
>+    gtk_widget_set_margin_end (table, 5);
>+#else
>+    gtk_widget_set_margin_left (table, 8);
>+    gtk_widget_set_margin_right (table, 5);
>+#endif
>     gtk_grid_set_column_spacing (GTK_GRID (table), 6);
>     gtk_grid_set_row_spacing (GTK_GRID (table), 6);
> 
>@@ -694,7 +697,7 @@ pgd_annot_view_set_annot (PgdAnnotsDemo *demo,
>           break;
>     }
> 
>-    gtk_container_add (GTK_CONTAINER (alignment), table);
>+    gtk_container_add (GTK_CONTAINER (demo->annot_view), table);
>     gtk_widget_show (table);
> }
> 
>-- 
>1.9.1

Actions: View | Splinter Review

Attachments on bug 88788: 112809 | 112810 | 112811 | 112812 | 112813 | 112814 | 112815 | 112816 | 112817 | 117367 | 117368 | 117377 | 117378 | 117379

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.