diff options
author | TingPing <tngpng@gmail.com> | 2013-05-16 09:07:38 -0700 |
---|---|---|
committer | TingPing <tngpng@gmail.com> | 2013-05-16 09:07:38 -0700 |
commit | 69c2893234452107b2db67e431868d7400ea25aa (patch) | |
tree | 904233560d5029a472ec6416b4874f55c9b17011 /src/fe-gtk/fe-gtk.c | |
parent | 26cefd0587a5ca092a7b4ee442c144eee9e19dc5 (diff) | |
parent | 8ccd11ee4bbf3d4a7a7fc06a872eca6d20544cba (diff) |
Merge pull request #586 from bviktor/authcleanup
Login and network list cleanup
Diffstat (limited to 'src/fe-gtk/fe-gtk.c')
-rw-r--r-- | src/fe-gtk/fe-gtk.c | 12 |
1 files changed, 4 insertions, 8 deletions
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; |