diff options
| -rw-r--r-- | e-util/ChangeLog | 1 | ||||
| -rw-r--r-- | e-util/e-dialog-utils.c | 13 |
2 files changed, 11 insertions, 3 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 3018e6a2fb..07a25faf12 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -8,6 +8,7 @@ deprecated and only used in one place. (e_file_dialog_save): Make this use GtkMessageDialog instead of GnomeDialog + (e_dialog_set_transient_for_xid): #ifdef out gtk 2.2 api usage 2003-03-25 Not Zed <NotZed@Ximian.com> diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 173526c46b..a37519297e 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -196,7 +196,9 @@ void e_dialog_set_transient_for_xid (GtkWindow *dialog, GdkNativeWindow xid) { +#ifdef GDK_MULTIHEAD_SAFE GdkDisplay *display; +#endif GdkWindow *parent; g_return_if_fail (GTK_IS_WINDOW (dialog)); @@ -208,12 +210,17 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog, return; } +#ifdef GDK_MULTIHEAD_SAFE display = gdk_drawable_get_display (GDK_DRAWABLE (GTK_WIDGET (dialog)->window)); parent = gdk_window_lookup_for_display (display, xid); - if (!parent) { + if (!parent) parent = gdk_window_foreign_new_for_display (display, xid); - g_return_if_fail (parent != NULL); - } +#else + parent = gdk_window_lookup (xid); + if (!parent) + parent = gdk_window_foreign_new (xid); +#endif + g_return_if_fail (parent != NULL); gdk_window_set_transient_for (GTK_WIDGET (dialog)->window, parent); } |