# HG changeset patch # User Herman Bloggs # Date 1061229024 0 # Node ID 4f93f10ddc75e2569eb8d30445aa2e1a7342e239 # Parent b474b364ae8b7ccd0a915623b7f4624bf29c970a [gaim-migrate @ 7009] Updates for new signal mechanism.. Nice job Christian. committer: Tailor Script diff -r b474b364ae8b -r 4f93f10ddc75 ChangeLog.win32 --- a/ChangeLog.win32 Mon Aug 18 16:38:00 2003 +0000 +++ b/ChangeLog.win32 Mon Aug 18 17:50:24 2003 +0000 @@ -1,3 +1,6 @@ +version 0.68: + * Installer translations for: Bulgarian + version 0.67 (08/14/2003): * Installer translations for: Dutch, French, German, Hungarian, Italian, Portuguese (Brazilian), Serbian (Latin) and diff -r b474b364ae8b -r 4f93f10ddc75 plugins/win32/transparency/win2ktrans.c --- a/plugins/win32/transparency/win2ktrans.c Mon Aug 18 16:38:00 2003 +0000 +++ b/plugins/win32/transparency/win2ktrans.c Mon Aug 18 17:50:24 2003 +0000 @@ -22,6 +22,7 @@ #include #include "internal.h" +#include "core.h" #include "prefs.h" #include "debug.h" @@ -29,6 +30,7 @@ #include "gtkplugin.h" #include "gtkblist.h" #include "gtkutils.h" +#include "signals.h" /* * MACROS & DEFINES @@ -172,15 +174,13 @@ return FALSE; } -static void gaim_new_conversation(char *who) { +static void gaim_new_conversation(GaimConversation *c) { GList *wl, *wl1; GtkWidget *vbox=NULL; GtkWidget *win=NULL; - GaimConversation *c; GaimGtkConversation *gtkconv; GaimGtkWindow *gtkwin; - c = gaim_find_conversation(who); gtkconv = GAIM_GTK_CONVERSATION(c); gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c)); @@ -277,8 +277,12 @@ imalpha = gaim_prefs_get_int(OPT_WINTRANS_IM_ALPHA); blalpha = gaim_prefs_get_int(OPT_WINTRANS_BL_ALPHA); - gaim_signal_connect(plugin, event_new_conversation, gaim_new_conversation, NULL); - gaim_signal_connect(plugin, event_signon, blist_created, NULL); + gaim_signal_connect((void*)gaim_conversations_get_handle(), + "conversation-created", + plugin, + GAIM_CALLBACK(gaim_new_conversation), + NULL); + gaim_signal_connect((void*)gaim_connections_get_handle(), "signed-on", plugin, GAIM_CALLBACK(blist_created), NULL); MySetLayeredWindowAttributes = (void*)wgaim_find_and_loadproc("user32.dll", "SetLayeredWindowAttributes" ); if(blist) { diff -r b474b364ae8b -r 4f93f10ddc75 plugins/win32/winprefs/winprefs.c --- a/plugins/win32/winprefs/winprefs.c Mon Aug 18 16:38:00 2003 +0000 +++ b/plugins/win32/winprefs/winprefs.c Mon Aug 18 17:50:24 2003 +0000 @@ -30,6 +30,7 @@ #include "internal.h" #include "gtkinternal.h" +#include "core.h" #include "prefs.h" #include "debug.h" @@ -37,6 +38,7 @@ #include "gtkutils.h" #include "gtkblist.h" #include "gtkappbar.h" +#include "signals.h" /* * MACROS & DEFINES @@ -145,11 +147,11 @@ gaim_debug(GAIM_DEBUG_INFO, "winprefs", "blist_destroy_cb\n"); blist_save_state(); blist_set_dockable(FALSE); - gaim_signal_connect(plugin_id, event_signon, blist_create_cb, NULL); + gaim_signal_connect((void*)gaim_connections_get_handle(), "signed-on", plugin_id, GAIM_CALLBACK(blist_create_cb), NULL); } static gboolean blist_create_cb_remove(gpointer data) { - gaim_signal_disconnect(plugin_id, event_signon, blist_create_cb); + gaim_signal_disconnect(gaim_connections_get_handle(), "signed-on", plugin_id, GAIM_CALLBACK(blist_create_cb)); return FALSE; } @@ -290,11 +292,11 @@ g_signal_connect(blist, "destroy", blist_destroy_cb, NULL); } else - gaim_signal_connect(plugin, event_signon, blist_create_cb, NULL); + gaim_signal_connect((void*)gaim_connections_get_handle(), "signed-on", plugin_id, GAIM_CALLBACK(blist_create_cb), NULL); wgaim_im_blink_state(gaim_prefs_get_bool(OPT_WINPREFS_IM_BLINK)); - gaim_signal_connect(plugin, event_quit, gaim_quit_cb, NULL); + gaim_signal_connect((void*)gaim_get_core(), "quitting", plugin, GAIM_CALLBACK(gaim_quit_cb), NULL); return TRUE; } diff -r b474b364ae8b -r 4f93f10ddc75 src/Makefile.mingw --- a/src/Makefile.mingw Mon Aug 18 16:38:00 2003 +0000 +++ b/src/Makefile.mingw Mon Aug 18 17:50:24 2003 +0000 @@ -83,7 +83,6 @@ debug.c \ dialogs.c \ dnd-hints.c \ - event.c \ ft.c \ gaim-disclosure.c \ gaimrc.c \ @@ -117,6 +116,7 @@ prpl.c \ request.c \ server.c \ + signals.c \ sound.c \ status.c \ stock.c \