changeset 4728:cf718383cd60

[gaim-migrate @ 5041] No longer filtering close and minimize events in buddy list window or in I'm back window committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Wed, 12 Mar 2003 16:51:23 +0000
parents 85a597deaff4
children 751c37a940dd
files src/win32/systray.c src/win32/systray.h src/win32/win32dep.c
diffstat 3 files changed, 1 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/src/win32/systray.c	Wed Mar 12 16:47:49 2003 +0000
+++ b/src/win32/systray.c	Wed Mar 12 16:51:23 2003 +0000
@@ -236,18 +236,6 @@
 			/* Double Click */
 			/* Either hide or show current window (login or buddy) */
 			gaim_gtk_blist_docklet_toggle();
-#if 0
-			/* if away.. hide/show I'm back win too */
-			if(st_state == SYSTRAY_STATE_AWAY) {
-				if(GTK_WIDGET_VISIBLE(blist) && !GTK_WIDGET_VISIBLE(imaway)) {
-					RestoreWndFromTray(GDK_WINDOW_HWND(GTK_WIDGET(imaway)->window));
-					gtk_window_present(GTK_WINDOW(imaway));
-				} else if(!GTK_WIDGET_VISIBLE(blist) && GTK_WIDGET_VISIBLE(imaway)) {
-					wgaim_systray_minimize(imaway);
-					gtk_widget_hide(imaway);
-				}
-			}
-#endif
 			debug_printf("Systray got double click\n");
 		}
 		if( lparam == WM_RBUTTONUP ) {
@@ -413,25 +401,6 @@
  * GAIM WINDOW FILTERS 
  **********************/
 
-GdkFilterReturn st_buddywin_filter( GdkXEvent *xevent, GdkEvent *event, gpointer data) {
-
-	MSG *msg = (MSG*)xevent;
-
-	switch( msg->message ) {
-	case WM_SYSCOMMAND:
-		if( msg->wParam == SC_MINIMIZE ) {
-			gaim_blist_set_visible(FALSE);
-			return GDK_FILTER_REMOVE;
-		}
-		break;
-	case WM_CLOSE:
-		gaim_blist_set_visible(FALSE);
-		return GDK_FILTER_REMOVE;
-	}
-
-	return GDK_FILTER_CONTINUE;
-}
-
 GdkFilterReturn st_loginwin_filter( GdkXEvent *xevent, GdkEvent *event, gpointer data) {
 	MSG *msg = (MSG*)xevent;
 
@@ -445,24 +414,6 @@
 	return GDK_FILTER_CONTINUE;
 }
 
-GdkFilterReturn st_backwin_filter( GdkXEvent *xevent, GdkEvent *event, gpointer data) {
-	MSG *msg = (MSG*)xevent;
-
-	switch( msg->message ) {
-	case WM_SYSCOMMAND:
-		if( msg->wParam == SC_MINIMIZE ) {
-			if(imaway) {
-				wgaim_systray_minimize(imaway);
-				gtk_widget_hide(imaway);
-			}
-			return GDK_FILTER_REMOVE;
-		}
-		break;
-	}
-	return GDK_FILTER_CONTINUE;
-}
-
-
 /* Create a hidden window and associate it with the systray icon.
    We use this hidden window to proccess WM_TRAYMESSAGE msgs. */
 void wgaim_systray_init(void) {
@@ -491,7 +442,7 @@
 }
 
 void wgaim_systray_cleanup(void) {
-	gaim_gtk_blist_docklet_remove();
+	/*gaim_gtk_blist_docklet_remove();*/
 	systray_remove_nid();
 	DestroyMenu(systray_menu);
 	DestroyWindow(systray_hwnd);
--- a/src/win32/systray.h	Wed Mar 12 16:47:49 2003 +0000
+++ b/src/win32/systray.h	Wed Mar 12 16:51:23 2003 +0000
@@ -10,9 +10,7 @@
 #define _SYSTRAY_H_
 
 extern void wgaim_systray_init(void);
-extern void wgaim_created_blistwin( GtkWidget* );
 extern void wgaim_created_loginwin( GtkWidget* );
-extern void wgaim_created_backwin( GtkWidget* );
 extern void wgaim_systray_cleanup(void);
 extern void wgaim_systray_minimize( GtkWidget* );
 extern void wgaim_systray_maximize( GtkWidget* );
--- a/src/win32/win32dep.c	Wed Mar 12 16:47:49 2003 +0000
+++ b/src/win32/win32dep.c	Wed Mar 12 16:51:23 2003 +0000
@@ -180,24 +180,12 @@
 /*
  *  These functions are called after their respective windows are created.
  */
-void wgaim_created_blistwin( GtkWidget *blist ) {
-	gdk_window_add_filter (GTK_WIDGET(blist)->window,
-			       st_buddywin_filter,
-			       NULL);
-}
-
 void wgaim_created_loginwin( GtkWidget *loginwin ) {
 	gdk_window_add_filter (GTK_WIDGET(loginwin)->window,
 			       st_loginwin_filter,
 			       NULL);
 }
 
-void wgaim_created_backwin( GtkWidget *backwin ) {
-	gdk_window_add_filter (GTK_WIDGET(backwin)->window,
-			       st_backwin_filter,
-			       NULL);
-}
-
 /* Determine Gaim Paths during Runtime */
 
 char* wgaim_install_dir(void) {