4 files changed, 37 insertions, 0 deletions
diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c
index 77e915e0..1841d1c8 100644
--- a/mate-panel/panel-addto.c
+++ b/mate-panel/panel-addto.c
@@ -1223,7 +1223,9 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
 {
 PanelAddtoDialog *dialog;
 GtkWidget *dialog_vbox;
+#if !GTK_CHECK_VERSION (3, 0, 0)
 GtkWidget *vbox;
+#endif
 GtkWidget *inner_vbox;
 GtkWidget *find_hbox;
 GtkWidget *sw;
@@ -1268,19 +1270,30 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
 gtk_container_set_border_width (GTK_CONTAINER (dialog->addto_dialog), 5);
 
 dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog->addto_dialog));
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_box_set_spacing (GTK_BOX (dialog_vbox), 12);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);
+#else
 gtk_box_set_spacing (GTK_BOX (dialog_vbox), 2);
+#endif
 
 g_signal_connect (G_OBJECT (dialog->addto_dialog), "response",
 G_CALLBACK (panel_addto_dialog_response), dialog);
 g_signal_connect (dialog->addto_dialog, "destroy",
 G_CALLBACK (panel_addto_dialog_destroy), dialog);
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
 vbox = gtk_vbox_new (FALSE, 12);
 gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 gtk_container_add (GTK_CONTAINER (dialog_vbox), vbox);
+#endif
 
 inner_vbox = gtk_vbox_new (FALSE, 6);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_box_pack_start (GTK_BOX (dialog_vbox), inner_vbox, TRUE, TRUE, 0);
+#else
 gtk_box_pack_start (GTK_BOX (vbox), inner_vbox, TRUE, TRUE, 0);
+#endif
 
 find_hbox = gtk_hbox_new (FALSE, 6);
 gtk_box_pack_start (GTK_BOX (inner_vbox), find_hbox, FALSE, FALSE, 0);
@@ -1362,7 +1375,11 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
 
 gtk_container_add (GTK_CONTAINER (sw), dialog->tree_view);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_show_all (dialog_vbox);
+#else
 gtk_widget_show_all (vbox);
+#endif
 
 panel_toplevel_push_autohide_disabler (dialog->panel_widget->toplevel);
 panel_widget_register_open_dialog (panel_widget,
diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c
index b86517e4..34fd8ee2 100644
--- a/mate-panel/panel-force-quit.c
+++ b/mate-panel/panel-force-quit.c
@@ -194,7 +194,11 @@ kill_window_response (GtkDialog *dialog,
 gdk_error_trap_push ();
 XKillClient (display, window);
 gdk_flush ();
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
 gdk_error_trap_pop ();
+#endif
 }
 
 gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/mate-panel/panel-xutils.c b/mate-panel/panel-xutils.c
index e970fb37..ccf68116 100644
--- a/mate-panel/panel-xutils.c
+++ b/mate-panel/panel-xutils.c
@@ -86,7 +86,11 @@ panel_xutils_set_window_type (GdkWindow *gdk_window,
 XChangeProperty (display, window, net_wm_window_type,
 XA_ATOM, 32, PropModeReplace,
 (guchar *) &atoms, i);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
 gdk_error_trap_pop ();
+#endif
 }
 
 enum {
@@ -159,7 +163,11 @@ panel_xutils_set_strut (GdkWindow *gdk_window,
 XChangeProperty (display, window, net_wm_strut_partial,
 XA_CARDINAL, 32, PropModeReplace,
 (guchar *) &struts, 12);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
 gdk_error_trap_pop ();
+#endif
 }
 
 void
@@ -181,7 +189,11 @@ panel_warp_pointer (GdkWindow *gdk_window,
 
 gdk_error_trap_push ();
 XWarpPointer (display, None, window, 0, 0, 0, 0, x, y);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
 gdk_error_trap_pop ();
+#endif
 }
 
 guint
diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c
index 2b54e293..d31f6d97 100644
--- a/mate-panel/xstuff.c
+++ b/mate-panel/xstuff.c
@@ -225,7 +225,11 @@ xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h)
 gdk_window_move_resize (window, x, y, w, h);
 
 gdk_flush ();
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
 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));