diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | share/doc/readme.md | 2 | ||||
| -rw-r--r-- | src/fe-gtk/dccgui.c | 8 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 12 | ||||
| -rw-r--r-- | src/fe-gtk/menu.c | 4 | ||||
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 4 | ||||
| -rw-r--r-- | src/fe-gtk/xtext.c | 4 |
7 files changed, 10 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 88f8464d..910565e9 100644 --- a/configure.ac +++ b/configure.ac @@ -199,7 +199,7 @@ dnl ********************************************************************* # we might get undefined macro without this test if test "$gtkfe" = yes ; then - AM_PATH_GTK_2_0(2.14.0, havegtk=yes, havegtk=no) + AM_PATH_GTK_2_0(2.24.0, havegtk=yes, havegtk=no) if test "$havegtk" = no; then gtkfe=no diff --git a/share/doc/readme.md b/share/doc/readme.md index ec2a6d9f..9d9cc91c 100644 --- a/share/doc/readme.md +++ b/share/doc/readme.md @@ -21,7 +21,7 @@ in general. HexChat runs on most BSD and POSIX compliant operating systems. ## Requirements: - * GTK+ 2.14 + * GTK+ 2.24 * GLib 2.14 HexChat is known to work on, at least: diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c index 0fb2e7e5..24d3bcbf 100644 --- a/src/fe-gtk/dccgui.c +++ b/src/fe-gtk/dccgui.c @@ -685,14 +685,14 @@ dcc_detail_label (char *text, GtkWidget *box, int num) static void dcc_exp_cb (GtkWidget *exp, GtkWidget *box) { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_visible (box)) -#else - if (GTK_WIDGET_VISIBLE (box)) -#endif + { gtk_widget_hide (box); + } else + { gtk_widget_show (box); + } } static void diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 0c3583d3..d737b744 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -897,15 +897,15 @@ fe_gui_info (session *sess, int info_type) switch (info_type) { case 0: /* window status */ -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_visible (GTK_WIDGET (sess->gui->window))) -#else - if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (sess->gui->window))) -#endif + { return 2; /* hidden (iconified or systray) */ + } if (gtk_window_is_active (GTK_WINDOW (sess->gui->window))) + { return 1; /* active/focused */ + } return 0; /* normal (no keyboard focus or behind a window) */ } @@ -920,12 +920,8 @@ fe_gui_info_ptr (session *sess, int info_type) { case 0: /* native window pointer (for plugins) */ #ifdef WIN32 -#if GTK_CHECK_VERSION(2,24,8) return gdk_win32_window_get_impl_hwnd (sess->gui->window->window); #else - return GDK_WINDOW_HWND (sess->gui->window->window); -#endif -#else return sess->gui->window; #endif break; diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index f0f49730..79e1bad8 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1729,11 +1729,7 @@ static gboolean menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data) { /* GTK2.2 behaviour */ -#if GTK_CHECK_VERSION(2,20,0) return gtk_widget_is_sensitive (widget); -#else - return GTK_WIDGET_IS_SENSITIVE (widget); -#endif } /* === STUFF FOR /MENU === */ diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 501dc0cd..d0196bcb 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -414,11 +414,7 @@ tray_toggle_visibility (gboolean force_hide) if (!win) return FALSE; -#if GTK_CHECK_VERSION(2,20,0) if (force_hide || gtk_widget_get_visible (GTK_WIDGET (win))) -#else - if (force_hide || GTK_WIDGET_VISIBLE (win)) -#endif { if (prefs.hex_gui_tray_away) hexchat_command (ph, "ALLSERV AWAY"); diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index e151524d..94db4687 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -1034,11 +1034,7 @@ gtk_xtext_realize (GtkWidget * widget) gdk_window_set_user_data (widget->window, widget); -#if GTK_CHECK_VERSION(2,24,0) xtext->depth = gdk_window_get_visual (widget->window)->depth; -#else - xtext->depth = gdk_drawable_get_visual (widget->window)->depth; -#endif val.subwindow_mode = GDK_INCLUDE_INFERIORS; val.graphics_exposures = 0; |