summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--capplet/gsm-properties-dialog.c2
-rw-r--r--mate-session/gsm-inhibit-dialog.c8
-rw-r--r--mate-session/msm-gnome.c10
3 files changed, 17 insertions, 3 deletions
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
index 6c5c8e8..c920882 100644
--- a/capplet/gsm-properties-dialog.c
+++ b/capplet/gsm-properties-dialog.c
@@ -605,7 +605,7 @@ setup_dialog (GsmPropertiesDialog *dialog)
if (targetlist != NULL) {
#if GTK_CHECK_VERSION (3, 0, 0)
GtkTargetEntry *targets;
- guint n_targets;
+ gint n_targets;
gint i;
targets = gtk_target_table_new_from_list (targetlist, &n_targets);
for (i = 0; i < n_targets; i++)
diff --git a/mate-session/gsm-inhibit-dialog.c b/mate-session/gsm-inhibit-dialog.c
index 1505449..3edc703 100644
--- a/mate-session/gsm-inhibit-dialog.c
+++ b/mate-session/gsm-inhibit-dialog.c
@@ -497,7 +497,11 @@ get_pixbuf_for_window (GdkDisplay *gdkdisplay,
gdk_error_trap_push ();
XFreePixmap (display, xpixmap);
gdk_display_sync (gdkdisplay);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
}
if (pixbuf != NULL) {
@@ -1038,7 +1042,11 @@ gsm_inhibit_dialog_constructor (GType type,
dialog->priv->have_xrender = FALSE;
}
gdk_display_sync (gdkdisplay);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
#endif /* HAVE_XRENDER */
/* FIXME: turn this on when it is ready */
diff --git a/mate-session/msm-gnome.c b/mate-session/msm-gnome.c
index e59ac4e..661d9e3 100644
--- a/mate-session/msm-gnome.c
+++ b/mate-session/msm-gnome.c
@@ -196,8 +196,11 @@ msm_compat_gnome_smproxy_startup (void)
(unsigned char *) (void *) &gnome_smproxy_window, 1);
XSync (dpy, False);
-
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
}
@@ -217,8 +220,11 @@ msm_compat_gnome_smproxy_shutdown (void)
#endif
gnome_smproxy_window = None;
}
-
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
}