# HG changeset patch # User Herman Bloggs # Date 1055522940 0 # Node ID 14891982dbee5df4b194b98963114d2b4e10632e # Parent 3ed4c7df2f415d6423324511bc67e21e56b756a2 [gaim-migrate @ 6285] Update to new prefs api and new debug api. Thanks SimGuy3k committer: Tailor Script diff -r 3ed4c7df2f41 -r 14891982dbee plugins/win32/transparency/win2ktrans.c --- a/plugins/win32/transparency/win2ktrans.c Fri Jun 13 11:06:49 2003 +0000 +++ b/plugins/win32/transparency/win2ktrans.c Fri Jun 13 16:49:00 2003 +0000 @@ -25,12 +25,13 @@ #include "gaim.h" #include "gtkplugin.h" #include "gtkblist.h" +#include "prefs.h" #include "win32dep.h" /* * MACROS & DEFINES */ -#define WINTRANS_PLUGIN_ID "win-gaim-trans" +#define WINTRANS_PLUGIN_ID "gtk-win-trans" #define WINTRANS_VERSION 1 /* These defines aren't found in mingw's winuser.h */ @@ -42,12 +43,6 @@ #define WS_EX_LAYERED 0x00080000 #endif -/* Transparency plugin configuration */ -#define OPT_WGAIM_IMTRANS 0x00000001 -#define OPT_WGAIM_SHOW_IMTRANS 0x00000002 -#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) /* @@ -66,28 +61,31 @@ /* * LOCALS */ +static const char *OPT_WINTRANS_IM_ENABLED="/plugins/gtk/win32/wintrans/im_enabled"; +static const char *OPT_WINTRANS_IM_ALPHA ="/plugins/gtk/win32/wintrans/im_alpha"; +static const char *OPT_WINTRANS_IM_SLIDER ="/plugins/gtk/win32/wintrans/im_slider"; +static const char *OPT_WINTRANS_BL_ENABLED="/plugins/gtk/win32/wintrans/bl_enabled"; +static const char *OPT_WINTRANS_BL_ALPHA ="/plugins/gtk/win32/wintrans/bl_alpha"; +static const char *OPT_WINTRANS_BL_ON_TOP ="/plugins/gtk/win32/wintrans/bl_on_top"; static int imalpha = 255; static int blalpha = 255; -guint trans_options = 0; GList *window_list = NULL; /* * PROTOS */ BOOL (*MySetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags)=NULL; -static void save_trans_prefs(); /* * CODE */ -static GtkWidget *wgaim_button(const char *text, guint *options, int option, GtkWidget *page) { - GtkWidget *button; +static GtkWidget *wgaim_button(const char *text, const char *pref, GtkWidget *page) { + GtkWidget *button; button = gtk_check_button_new_with_mnemonic(text); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), (*options & option)); - gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0); - g_object_set_data(G_OBJECT(button), "options", options); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), gaim_prefs_get_bool(pref)); + gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0); gtk_widget_show(button); - return button; + return button; } /* Set window transparency level */ @@ -164,7 +162,7 @@ gboolean win_destroy_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data) { slider_win *slidwin=NULL; /* Remove window from the window list */ - debug_printf("win2ktrans.dll: Conv window destoyed.. removing from list\n"); + gaim_debug(GAIM_DEBUG_INFO, WINTRANS_PLUGIN_ID, "Conv window destoyed.. removing from list\n"); if((slidwin=find_slidwin(widget))) { window_list = g_list_remove(window_list, (gpointer)slidwin); @@ -188,8 +186,7 @@ win = gtkwin->window; /* check prefs to see if we want trans */ - if ((trans_options & OPT_WGAIM_IMTRANS) && - (trans_options & OPT_WGAIM_SHOW_IMTRANS)) { + if (gaim_prefs_get_bool(OPT_WINTRANS_IM_SLIDER)) { /* Look up this window to see if it already has a scroller */ if(!find_slidwin(win)) { GtkWidget *slider_box=NULL; @@ -202,7 +199,7 @@ if ( GTK_IS_VBOX(GTK_OBJECT(wl->data)) ) vbox = GTK_WIDGET(wl->data); else { - debug_printf("no vbox found\n"); + gaim_debug(GAIM_DEBUG_ERROR, WINTRANS_PLUGIN_ID, "no vbox found\n"); return; } } @@ -224,20 +221,20 @@ return; } - if((trans_options & OPT_WGAIM_IMTRANS) && - !(trans_options & OPT_WGAIM_SHOW_IMTRANS)) { + if(gaim_prefs_get_bool(OPT_WINTRANS_IM_ENABLED) && + !gaim_prefs_get_bool(OPT_WINTRANS_IM_SLIDER)) { set_wintrans(win, imalpha); } } static void blist_created() { if(blist) { - if(trans_options & OPT_WGAIM_BUDDYWIN_ONTOP) + if(gaim_prefs_get_bool(OPT_WINTRANS_BL_ON_TOP)) SetWindowPos(GDK_WINDOW_HWND(blist->window), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); else SetWindowPos(GDK_WINDOW_HWND(blist->window), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - if(trans_options & OPT_WGAIM_BLTRANS) + if(gaim_prefs_get_bool(OPT_WINTRANS_BL_ENABLED)) set_wintrans(blist, blalpha); else set_wintrans_off(blist); @@ -249,105 +246,34 @@ *alpha = gtk_range_get_value(GTK_RANGE(w)); } +static void alpha_pref_set_int(GtkWidget *w, GdkEventFocus *e, const char *pref) { + int alpha = 0; + if (pref == OPT_WINTRANS_IM_ALPHA) + alpha = imalpha; + else if (pref == OPT_WINTRANS_BL_ALPHA) + alpha = blalpha; + + gaim_prefs_set_int(pref, alpha); +} + static void bl_alpha_change(GtkWidget *w, gpointer data) { alpha_change(w, data); if(blist) change_alpha(w, blist); } -/* Load options */ -static void load_trans_prefs() { - FILE *f; - char buf[1024]; - int ver=0; - char tag[256]; - - if (gaim_home_dir()) - g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S ".gaim" G_DIR_SEPARATOR_S "wintransrc", gaim_home_dir()); - else - return; - - if ((f = fopen(buf, "r"))) { - fgets(buf, sizeof(buf), f); - sscanf(buf, "# wintransrc v%d", &ver); - if ((ver > 1) || (buf[0] != '#')) - return; - - while (!feof(f)) { - fgets(buf, sizeof(buf), f); - sscanf(buf, "%s {", tag); - if (strcmp(tag, "options")==0) { - fgets(buf, sizeof(buf), f); - sscanf(buf, "\ttrans_options { %d", &trans_options); - continue; - } else if (strcmp(tag, "trans")==0) { - int num; - for(fgets(buf, sizeof(buf), f);buf[0] != '}' && !feof(f);fgets(buf, sizeof(buf), f)) { - sscanf(buf, "\t%s { %d", tag, &num); - if(strcmp(tag, "imalpha")==0) { - imalpha = num; - } - else if(strcmp(tag, "blalpha")==0) { - blalpha = num; - } - } - } - } - } - else - save_trans_prefs(); - blist_created(); -} - -/* Save options */ - -static void write_options(FILE *f) { - fprintf(f, "options {\n"); - fprintf(f, "\ttrans_options { %u }\n", trans_options); - fprintf(f, "}\n"); -} - -static void write_trans(FILE *f) { - fprintf(f, "trans {\n"); - fprintf(f, "\timalpha { %d }\n", imalpha); - fprintf(f, "\tblalpha { %d }\n", blalpha); - fprintf(f, "}\n"); -} - -static void save_trans_prefs() { - FILE *f; - char buf[1024]; - - if (gaim_home_dir()) { - g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S ".gaim" G_DIR_SEPARATOR_S "wintransrc", gaim_home_dir()); - } - else - return; - - if ((f = fopen(buf, "w"))) { - fprintf(f, "# wintransrc v%d\n", WINTRANS_VERSION); - write_trans(f); - write_options(f); - fclose(f); - } - else - debug_printf("Error opening wintransrc\n"); -} - -static void set_trans_option(GtkWidget *w, int option) { - trans_options ^= option; - save_trans_prefs(); - - if(option == OPT_WGAIM_BUDDYWIN_ONTOP) { +static void set_trans_option(GtkWidget *w, const char *pref) { + gaim_prefs_set_bool(pref, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))); + if(pref == OPT_WINTRANS_BL_ON_TOP) { if(blist) { - if(trans_options & OPT_WGAIM_BUDDYWIN_ONTOP) + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) SetWindowPos(GDK_WINDOW_HWND(blist->window), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); else SetWindowPos(GDK_WINDOW_HWND(blist->window), HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); } - } else if(option == OPT_WGAIM_BLTRANS) { + } else if(pref == OPT_WINTRANS_BL_ENABLED) { if(blist) { - if(trans_options & OPT_WGAIM_BLTRANS) + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) set_wintrans(blist, blalpha); else set_wintrans_off(blist); @@ -359,16 +285,22 @@ * EXPORTED FUNCTIONS */ G_MODULE_EXPORT gboolean plugin_load(GaimPlugin *plugin) { + 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); MySetLayeredWindowAttributes = (void*)wgaim_find_and_loadproc("user32.dll", "SetLayeredWindowAttributes" ); - load_trans_prefs(); + + if(blist) { + blist_created(); + } return TRUE; } G_MODULE_EXPORT gboolean plugin_unload(GaimPlugin *plugin) { - debug_printf("Removing win2ktrans.dll plugin\n"); + gaim_debug(GAIM_DEBUG_INFO, WINTRANS_PLUGIN_ID, "Removing win2ktrans.dll plugin\n"); /* Remove slider bars */ if(window_list) { @@ -403,18 +335,18 @@ /* IM Convo trans options */ imtransbox = gaim_gtk_make_frame (ret, _("IM Conversation Windows")); - button = wgaim_button(_("_IM window transparency"), &trans_options, OPT_WGAIM_IMTRANS, imtransbox); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (int *)OPT_WGAIM_IMTRANS); + button = wgaim_button(_("_IM window transparency"), OPT_WINTRANS_IM_ENABLED, imtransbox); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (void *)OPT_WINTRANS_IM_ENABLED); trans_box = gtk_vbox_new(FALSE, 18); - if (!(trans_options & OPT_WGAIM_IMTRANS)) + if (!gaim_prefs_get_bool(OPT_WINTRANS_IM_ENABLED)) gtk_widget_set_sensitive(GTK_WIDGET(trans_box), FALSE); gtk_widget_show(trans_box); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gaim_gtk_toggle_sensitive), trans_box); - button = wgaim_button(_("_Show slider bar in IM window"), &trans_options, OPT_WGAIM_SHOW_IMTRANS, trans_box); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (int *)OPT_WGAIM_SHOW_IMTRANS); + button = wgaim_button(_("_Show slider bar in IM window"), OPT_WINTRANS_IM_SLIDER, trans_box); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (void *)OPT_WINTRANS_IM_SLIDER); gtk_box_pack_start(GTK_BOX(imtransbox), trans_box, FALSE, FALSE, 5); @@ -429,7 +361,7 @@ gtk_widget_set_usize(GTK_WIDGET(slider), 200, -1); gtk_signal_connect(GTK_OBJECT(slider), "value-changed", GTK_SIGNAL_FUNC(alpha_change), (void*)&imalpha); - gtk_signal_connect(GTK_OBJECT(slider), "focus-out-event", GTK_SIGNAL_FUNC(save_trans_prefs), NULL); + gtk_signal_connect(GTK_OBJECT(slider), "focus-out-event", GTK_SIGNAL_FUNC(alpha_pref_set_int), (void *)OPT_WINTRANS_IM_ALPHA); gtk_box_pack_start(GTK_BOX(hbox), slider, FALSE, TRUE, 5); @@ -439,14 +371,14 @@ /* Buddy List trans options */ bltransbox = gaim_gtk_make_frame (ret, _("Buddy List Window")); - button = wgaim_button(_("_Keep Buddy List window on top"), &trans_options, OPT_WGAIM_BUDDYWIN_ONTOP, bltransbox); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (int *)OPT_WGAIM_BUDDYWIN_ONTOP); + button = wgaim_button(_("_Keep Buddy List window on top"), OPT_WINTRANS_BL_ON_TOP, bltransbox); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (void *)OPT_WINTRANS_BL_ON_TOP); - button = wgaim_button(_("_Buddy List window transparency"), &trans_options, OPT_WGAIM_BLTRANS, bltransbox); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (int *)OPT_WGAIM_BLTRANS); + button = wgaim_button(_("_Buddy List window transparency"), OPT_WINTRANS_BL_ENABLED, bltransbox); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_trans_option), (void *)OPT_WINTRANS_BL_ENABLED); trans_box = gtk_vbox_new(FALSE, 18); - if (!(trans_options & OPT_WGAIM_BLTRANS)) + if (!gaim_prefs_get_bool(OPT_WINTRANS_BL_ENABLED)) gtk_widget_set_sensitive(GTK_WIDGET(trans_box), FALSE); gtk_widget_show(trans_box); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gaim_gtk_toggle_sensitive), trans_box); @@ -463,7 +395,7 @@ gtk_widget_set_usize(GTK_WIDGET(slider), 200, -1); gtk_signal_connect(GTK_OBJECT(slider), "value-changed", GTK_SIGNAL_FUNC(bl_alpha_change), (void*)&blalpha); - gtk_signal_connect(GTK_OBJECT(slider), "focus-out-event", GTK_SIGNAL_FUNC(save_trans_prefs), NULL); + gtk_signal_connect(GTK_OBJECT(slider), "focus-out-event", GTK_SIGNAL_FUNC(alpha_pref_set_int), (void *)OPT_WINTRANS_BL_ALPHA); gtk_box_pack_start(GTK_BOX(hbox), slider, FALSE, TRUE, 5); @@ -473,7 +405,7 @@ /* If this version of Windows dosn't support Transparency, grey out options */ if(!has_transparency()) { - debug_printf("This version of windows dosn't support transparency\n"); + gaim_debug(GAIM_DEBUG_WARNING, WINTRANS_PLUGIN_ID, "This version of windows dosn't support transparency\n"); gtk_widget_set_sensitive(GTK_WIDGET(imtransbox), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(trans_box), FALSE); @@ -516,8 +448,16 @@ }; static void -__init_plugin(GaimPlugin *plugin) +init_plugin(GaimPlugin *plugin) { + gaim_prefs_add_none("/plugins/gtk/win32"); + gaim_prefs_add_none("/plugins/gtk/win32/wintrans"); + gaim_prefs_add_bool("/plugins/gtk/win32/wintrans/im_enabled", FALSE); + gaim_prefs_add_int("/plugins/gtk/win32/wintrans/im_alpha", 255); + gaim_prefs_add_bool("/plugins/gtk/win32/wintrans/im_slider", FALSE); + gaim_prefs_add_bool("/plugins/gtk/win32/wintrans/bl_enabled", FALSE); + gaim_prefs_add_int("/plugins/gtk/win32/wintrans/bl_alpha", 255); + gaim_prefs_add_bool("/plugins/gtk/win32/wintrans/bl_on_top", FALSE); } -GAIM_INIT_PLUGIN(wintrans, __init_plugin, info); +GAIM_INIT_PLUGIN(wintrans, init_plugin, info); diff -r 3ed4c7df2f41 -r 14891982dbee plugins/win32/winprefs/winprefs.c --- a/plugins/win32/winprefs/winprefs.c Fri Jun 13 11:06:49 2003 +0000 +++ b/plugins/win32/winprefs/winprefs.c Fri Jun 13 16:49:00 2003 +0000 @@ -29,7 +29,7 @@ /* * MACROS & DEFINES */ -#define WINPREFS_PLUGIN_ID "gaim-winprefs" +#define WINPREFS_PLUGIN_ID "gtk-win-prefs" #define WINPREFS_VERSION 1 /* @@ -63,7 +63,7 @@ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", 0, samDesired, phKey)); else { - gaim_debug(3, WINPREFS_PLUGIN_ID, "open_run_key: Could not open key for writing value\n"); + gaim_debug(GAIM_DEBUG_ERROR, WINPREFS_PLUGIN_ID, "open_run_key: Could not open key for writing value\n"); return 0; } return 1; @@ -83,7 +83,7 @@ if((size = GetModuleFileName(wgaim_hinstance(), (LPBYTE)buffer, sizeof(buffer)))==0) { - gaim_debug(3, WINPREFS_PLUGIN_ID, "GetModuleFileName Error.. Could not set Gaim autostart.\n"); + gaim_debug(GAIM_DEBUG_ERROR, WINPREFS_PLUGIN_ID, "GetModuleFileName Error.. Could not set Gaim autostart.\n"); RegCloseKey(hKey); return; } @@ -94,11 +94,11 @@ REG_SZ, buffer, size)) - gaim_debug(3, WINPREFS_PLUGIN_ID, "Could not set registry key value\n"); + gaim_debug(GAIM_DEBUG_ERROR, WINPREFS_PLUGIN_ID, "Could not set registry key value\n"); } else { if(ERROR_SUCCESS != RegDeleteValue(hKey, "Gaim")) - gaim_debug(3, WINPREFS_PLUGIN_ID, "Could not delete registry key value\n"); + gaim_debug(GAIM_DEBUG_ERROR, WINPREFS_PLUGIN_ID, "Could not delete registry key value\n"); } RegCloseKey(hKey); } diff -r 3ed4c7df2f41 -r 14891982dbee src/win32/win32dep.c --- a/src/win32/win32dep.c Fri Jun 13 11:06:49 2003 +0000 +++ b/src/win32/win32dep.c Fri Jun 13 16:49:00 2003 +0000 @@ -68,11 +68,11 @@ static void halt_flash_filter(GtkWidget *widget, GdkEventFocus *event, WGAIM_FLASH_INFO *finfo) { /* Stop flashing and remove filter */ - debug_printf("Removing timeout\n"); + gaim_debug(GAIM_DEBUG_INFO, "wgaim", "Removing timeout\n"); g_source_remove(finfo->t_handle); - debug_printf("Disconnecting signal handler\n"); + gaim_debug(GAIM_DEBUG_INFO, "wgaim", "Disconnecting signal handler\n"); g_signal_handler_disconnect(G_OBJECT(widget),finfo->sig_handler); - debug_printf("done\n"); + gaim_debug(GAIM_DEBUG_INFO, "wgaim", "done\n"); } static void load_winver_specific_procs(void) { @@ -151,9 +151,9 @@ FARPROC proc = 0; if(!(hmod=GetModuleHandle(dllname))) { - debug_printf("%s not found. Loading it..\n", dllname); + gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "%s not found. Loading it..\n", dllname); if(!(hmod = LoadLibrary(dllname))) { - debug_printf("Could not load: %s\n", dllname); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim", "Could not load: %s\n", dllname); return NULL; } else @@ -161,12 +161,12 @@ } if((proc=GetProcAddress(hmod, procedure))) { - debug_printf("This version of %s contains %s\n", + gaim_debug(GAIM_DEBUG_INFO, "wgaim", "This version of %s contains %s\n", dllname, procedure); return proc; } else { - debug_printf("Function: %s not found in dll: %s\n", + gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "Function %s not found in dll %s\n", procedure, dllname); if(did_load) { /* unload dll */ @@ -185,13 +185,13 @@ hmod = GetModuleHandle(NULL); if( hmod == 0 ) { buf = g_win32_error_message( GetLastError() ); - debug_printf("GetModuleHandle error: %s\n", buf); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim", "GetModuleHandle error: %s\n", buf); free(buf); return NULL; } if(GetModuleFileName( hmod, (char*)&install_dir, MAXPATHLEN ) == 0) { buf = g_win32_error_message( GetLastError() ); - debug_printf("GetModuleFileName error: %s\n", buf); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim", "GetModuleFileName error: %s\n", buf); free(buf); return NULL; } @@ -249,19 +249,19 @@ if((fin = gzopen(in, "rb"))) { if(!(fout = fopen(out, "wb"))) { - debug_printf("wgaim_gz_decompress: Error opening file: %s\n", out); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim_gz_decompress", "Error opening file: %s\n", out); gzclose(fin); return 0; } } else { - debug_printf("wgaim_gz_decompress: gzopen failed to open: %s\n", in); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim_gz_decompress", "gzopen failed to open: %s\n", in); return 0; } while((ret=gzread(fin, buf, 1024))) { if(fwrite(buf, 1, ret, fout) < ret) { - debug_printf("wgaim_gz_decompress: Error writing %d bytes to file\n", ret); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim_gz_decompress", "Error writing %d bytes to file\n", ret); gzclose(fin); fclose(fout); return 0; @@ -271,7 +271,7 @@ gzclose(fin); if(ret < 0) { - debug_printf("wgaim_gz_decompress: gzread failed while reading: %s\n", in); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim_gz_decompress", "gzread failed while reading: %s\n", in); return 0; } @@ -288,14 +288,14 @@ if(untar(tmpfile, destdir, UNTAR_FORCE | UNTAR_QUIET)) ret=1; else { - debug_printf("wgaim_gz_untar: Failure untaring %s\n", tmpfile); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim_gz_untar", "Failure untaring %s\n", tmpfile); ret=0; } unlink(tmpfile); return ret; } else { - debug_printf("wgaim_gz_untar: Failed to gz decompress %s\n", filename); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim_gz_untar", "Failed to gz decompress %s\n", filename); return 0; } } @@ -309,7 +309,7 @@ char newenv[128]; char* drmingw; - debug_printf("wgaim_init\n"); + gaim_debug(GAIM_DEBUG_INFO, "wgaim", "wgaim_init\n"); /* Load exception handler if we have it */ drmingw = g_build_filename(wgaim_install_dir(), "exchndl.dll", NULL); @@ -335,18 +335,18 @@ if ( LOBYTE( wsaData.wVersion ) != 2 || HIBYTE( wsaData.wVersion ) != 2 ) { - debug_printf("Could not find a usable WinSock DLL. Oh well.\n"); + gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "Could not find a usable WinSock DLL. Oh well.\n"); WSACleanup( ); } /* get default locale */ locale = g_win32_getlocale(); - debug_printf("Language profile used: %s\n", locale); + gaim_debug(GAIM_DEBUG_INFO, "wgaim", "Language profile used: %s\n", locale); /* Aspell config */ sprintf(newenv, "LANG=%s", locale); if(putenv(newenv)<0) - debug_printf("putenv failed\n"); + gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "putenv failed\n"); g_free(locale); /* Disable PANGO UNISCRIBE (for GTK 2.2.0). This may not be necessary in the @@ -356,13 +356,13 @@ */ sprintf(newenv, "PANGO_WIN32_NO_UNISCRIBE=1"); if(putenv(newenv)<0) - debug_printf("putenv failed\n"); + gaim_debug(GAIM_DEBUG_WARNING, "wgaim", "putenv failed\n"); /* * IdleTracker Initialization */ if(!wgaim_set_idlehooks()) - debug_printf("Failed to initialize idle tracker\n"); + gaim_debug(GAIM_DEBUG_ERROR, "wgaim", "Failed to initialize idle tracker\n"); wgaim_gtkspell_init(); } @@ -370,7 +370,7 @@ /* Windows Cleanup */ void wgaim_cleanup(void) { - debug_printf("wgaim_cleanup\n"); + gaim_debug(GAIM_DEBUG_INFO, "wgaim", "wgaim_cleanup\n"); /* winsock cleanup */ WSACleanup( );