summaryrefslogtreecommitdiff
path: root/src/terminal-window.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2015-08-25 16:00:41 +0300
committerinfirit <[email protected]>2015-09-08 13:39:20 +0200
commit80c5e88588752d4a856a43fe292569afa6c1c31d (patch)
tree9008690c45e474f619279daca2a57596eebfc67f /src/terminal-window.c
parent589ab9b7ce52f9b53dbea123c8fd2d9b3de1e53f (diff)
downloadmate-terminal-80c5e88588752d4a856a43fe292569afa6c1c31d.tar.bz2
mate-terminal-80c5e88588752d4a856a43fe292569afa6c1c31d.tar.xz
drop support for win32/osx
Diffstat (limited to 'src/terminal-window.c')
-rw-r--r--src/terminal-window.c54
1 files changed, 17 insertions, 37 deletions
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 1aebcd9..3b8dc97 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -22,12 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <gtk/gtk.h>
-#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
-#ifndef GDK_IS_X11_DISPLAY
-#define GDK_IS_X11_DISPLAY(display) 1
-#endif
-#endif
#include <gdk/gdkkeysyms.h>
#include <libmate-desktop/mate-aboutdialog.h>
@@ -1748,16 +1743,11 @@ terminal_window_screen_update (TerminalWindow *window,
{
TerminalApp *app;
-#ifdef GDK_WINDOWING_X11
- if (GDK_IS_X11_DISPLAY (gdk_screen_get_display (screen)))
- {
- terminal_window_window_manager_changed_cb (screen, window);
- g_signal_connect (screen, "window-manager-changed",
- G_CALLBACK (terminal_window_window_manager_changed_cb), window);
- g_signal_connect (screen, "composited-changed",
- G_CALLBACK (terminal_window_composited_changed_cb), window);
- }
-#endif
+ terminal_window_window_manager_changed_cb (screen, window);
+ g_signal_connect (screen, "window-manager-changed",
+ G_CALLBACK (terminal_window_window_manager_changed_cb), window);
+ g_signal_connect (screen, "composited-changed",
+ G_CALLBACK (terminal_window_composited_changed_cb), window);
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (screen), "GT::HasSettingsConnection")))
return;
@@ -1792,17 +1782,12 @@ terminal_window_screen_changed (GtkWidget *widget,
if (previous_screen)
{
-#ifdef GDK_WINDOWING_X11
- if (GDK_IS_X11_DISPLAY (gdk_screen_get_display (previous_screen)))
- {
- g_signal_handlers_disconnect_by_func (previous_screen,
- G_CALLBACK (terminal_window_window_manager_changed_cb),
- window);
- g_signal_handlers_disconnect_by_func (previous_screen,
- G_CALLBACK (terminal_window_composited_changed_cb),
- window);
- }
-#endif
+ g_signal_handlers_disconnect_by_func (previous_screen,
+ G_CALLBACK (terminal_window_window_manager_changed_cb),
+ window);
+ g_signal_handlers_disconnect_by_func (previous_screen,
+ G_CALLBACK (terminal_window_composited_changed_cb),
+ window);
}
if (!screen)
@@ -2345,17 +2330,12 @@ terminal_window_dispose (GObject *object)
screen = gtk_widget_get_screen (GTK_WIDGET (object));
if (screen)
{
-#ifdef GDK_WINDOWING_X11
- if (GDK_IS_X11_DISPLAY (gdk_screen_get_display (screen)))
- {
- g_signal_handlers_disconnect_by_func (screen,
- G_CALLBACK (terminal_window_window_manager_changed_cb),
- window);
- g_signal_handlers_disconnect_by_func (screen,
- G_CALLBACK (terminal_window_composited_changed_cb),
- window);
- }
-#endif
+ g_signal_handlers_disconnect_by_func (screen,
+ G_CALLBACK (terminal_window_window_manager_changed_cb),
+ window);
+ g_signal_handlers_disconnect_by_func (screen,
+ G_CALLBACK (terminal_window_composited_changed_cb),
+ window);
}
G_OBJECT_CLASS (terminal_window_parent_class)->dispose (object);