summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2015-12-17 16:03:47 +0100
committerWolfgang Ulbrich <[email protected]>2015-12-17 16:03:47 +0100
commit2c985fd3b3a1690a5734bfc923a72bd4ee7381bd (patch)
treeec5f6849c934f9158f274b9fe01ce039b41d7644
parentd916ca590d2d325575d197ff2227c3d0df915cd5 (diff)
downloadmate-applets-2c985fd3b3a1690a5734bfc923a72bd4ee7381bd.tar.bz2
mate-applets-2c985fd3b3a1690a5734bfc923a72bd4ee7381bd.tar.xz
GTK3 trash: don't use deprecated gdk_error_trap_pop + GtkMisc
-rw-r--r--trashapplet/src/trashapplet.c13
-rw-r--r--trashapplet/src/xstuff.c4
2 files changed, 17 insertions, 0 deletions
diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c
index 104fd10c..ae79790a 100644
--- a/trashapplet/src/trashapplet.c
+++ b/trashapplet/src/trashapplet.c
@@ -473,7 +473,12 @@ confirm_delete_immediately (GtkWidget *parent_view,
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
GTK_ICON_SIZE_DIALOG);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+#endif
gtk_widget_show (image);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
@@ -498,7 +503,11 @@ confirm_delete_immediately (GtkWidget *parent_view,
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+#endif
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
g_free (str);
@@ -506,7 +515,11 @@ confirm_delete_immediately (GtkWidget *parent_view,
label = gtk_label_new (detail);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+#endif
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
g_free (detail);
diff --git a/trashapplet/src/xstuff.c b/trashapplet/src/xstuff.c
index 62f7c6bc..20c97f6a 100644
--- a/trashapplet/src/xstuff.c
+++ b/trashapplet/src/xstuff.c
@@ -250,8 +250,12 @@ xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h)
gdk_window_move_resize (window, x, y, w, h);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_flush ();
gdk_error_trap_pop ();
+#endif
g_object_set_data (G_OBJECT (window), "xstuff-cached-x", GINT_TO_POINTER (x));
g_object_set_data (G_OBJECT (window), "xstuff-cached-y", GINT_TO_POINTER (y));