diff options
| author | infirit <[email protected]> | 2014-05-20 12:45:42 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-20 13:22:53 +0200 |
| commit | 50ac67e11f946fb6539b30fbb86e60b94fa695d9 (patch) | |
| tree | 5acef8e787da447ec51c4fd3b69f7a06cd13fbcb /src/terminal-screen.c | |
| parent | 0b75b3c4b4354b72b604c6313ceef97d9ecb007c (diff) | |
| download | mate-terminal-50ac67e11f946fb6539b30fbb86e60b94fa695d9.tar.bz2 mate-terminal-50ac67e11f946fb6539b30fbb86e60b94fa695d9.tar.xz | |
Cleanup GTK_CHECK_VERSION and unify gtk+2/3 code where possible
Always use gdk_window_get_display and GDK_WINDOW_XID
Replace GtkObject with GObject
Always use gtk_message_dialog_get_message_area (since gtk 2.22)
Unify notebook code between gtk2 and gtk3
Diffstat (limited to 'src/terminal-screen.c')
| -rw-r--r-- | src/terminal-screen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/terminal-screen.c b/src/terminal-screen.c index 91d503f..79995dc 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -51,7 +51,6 @@ #if GTK_CHECK_VERSION(3, 0, 0) #include <gdk/gdkkeysyms-compat.h> - #define GDK_WINDOW_XWINDOW GDK_WINDOW_XID #endif #define URL_MATCH_CURSOR (GDK_HAND2) @@ -1413,7 +1412,7 @@ get_child_environment (TerminalScreen *screen, /* FIXME: moving the tab between windows, or the window between displays will make the next two invalid... */ if (GDK_IS_X11_DISPLAY(display)) { - g_hash_table_replace (env_table, g_strdup ("WINDOWID"), g_strdup_printf ("%ld", GDK_WINDOW_XWINDOW (gtk_widget_get_window (window)))); + g_hash_table_replace (env_table, g_strdup ("WINDOWID"), g_strdup_printf ("%ld", GDK_WINDOW_XID (gtk_widget_get_window (window)))); g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (display))); } #endif |