# HG changeset patch # User Herman Bloggs # Date 1047487533 0 # Node ID 0b1c01fd68f1c3b1a8a0be8c8694723c0494d70c # Parent fd44726a527fb38a72b5cb118a13bfb9df61bc8d [gaim-migrate @ 5039] Fixed win2ktrans and iconaway plugins committer: Tailor Script diff -r fd44726a527f -r 0b1c01fd68f1 plugins/Makefile.mingw --- a/plugins/Makefile.mingw Wed Mar 12 12:35:02 2003 +0000 +++ b/plugins/Makefile.mingw Wed Mar 12 16:45:33 2003 +0000 @@ -76,15 +76,13 @@ all: plugins $(MAKE) -C $(TICKER) -f Makefile.mingw $(MAKE) -C $(WINPREFS) -f Makefile.mingw - -# $(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw + $(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw install: cp $(GAIM_PLUGINS)/*.dll $(GAIM_INSTALL_DIR)/plugins $(MAKE) -C $(TICKER) -f Makefile.mingw install $(MAKE) -C $(WINPREFS) -f Makefile.mingw install - -# $(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw install + $(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw install # # BUILD Plugin @@ -98,9 +96,8 @@ $(CC) -mdll -o $@ tmp$@.o -Wl,$@.exp $(LIB_PATHS) $(LIBS) rm -rf $@.base $@.def $@.exp junk.tmp -plugins: spellchk.dll autorecon.dll +plugins: iconaway.dll spellchk.dll autorecon.dll -# iconaway.dll ## ## CLEAN RULES diff -r fd44726a527f -r 0b1c01fd68f1 plugins/iconaway.c --- a/plugins/iconaway.c Wed Mar 12 12:35:02 2003 +0000 +++ b/plugins/iconaway.c Wed Mar 12 16:45:33 2003 +0000 @@ -15,9 +15,9 @@ void *handle; G_MODULE_IMPORT GtkWidget *imaway; -G_MODULE_IMPORT GtkWidget *blist; +/*G_MODULE_IMPORT GtkWidget *blist;*/ /* XXX G_MODULE_IMPORT GtkWidget *all_chats; */ -G_MODULE_IMPORT GtkWidget *all_convos; +/*G_MODULE_IMPORT GtkWidget *all_convos;*/ #ifdef USE_APPLET extern void applet_destroy_buddy(); @@ -32,7 +32,7 @@ return; gtk_window_iconify(GTK_WINDOW(imaway)); - hide_buddy_list(); + gaim_blist_set_visible(FALSE); for (windows = gaim_get_windows(); windows != NULL; diff -r fd44726a527f -r 0b1c01fd68f1 plugins/win32/transparency/win2ktrans.c --- a/plugins/win32/transparency/win2ktrans.c Wed Mar 12 12:35:02 2003 +0000 +++ b/plugins/win32/transparency/win2ktrans.c Wed Mar 12 16:45:33 2003 +0000 @@ -25,6 +25,7 @@ #include #include #include "gaim.h" +#include "gtklist.h" #include "win32dep.h" /* @@ -47,6 +48,8 @@ #define OPT_WGAIM_BLTRANS 0x00000004 #define OPT_WGAIM_BUDDYWIN_ONTOP 0x00000008 +#define blist (gaim_get_blist()?(GAIM_GTK_BLIST(gaim_get_blist())?((GAIM_GTK_BLIST(gaim_get_blist()))->window):NULL):NULL) + /* * DATA STRUCTS */ @@ -59,7 +62,6 @@ /* * GLOBALS */ -G_MODULE_IMPORT GtkWidget *blist; /* * LOCALS