[Gaim-commits] CVS: gaim/src/win32 systray.c,1.8,1.9

[Herman B. <her...@us...>]

Update of /cvsroot/gaim/gaim/src/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv27166

Modified Files:
	systray.c 
Log Message:
No longer filtering close and minimize events in buddy list window
or in I'm back window

Index: systray.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/systray.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- systray.c	11 Mar 2003 20:37:50 -0000	1.8
+++ systray.c	12 Mar 2003 16:50:44 -0000	1.9
@@ -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);