← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to libpurple/win32/win32dep.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-09 19:40:26 UTC
  • mfrom: (1.4.1 upstream) (46.1.10 karmic)
  • Revision ID: james.westby@ubuntu.com-20091009194026-wbqqh0bsbz19nx5q
Tags: 1:2.6.2-1ubuntu7
https://launchpad.net/bugs/346840
https://launchpad.net/bugs/209440
* Don't stick the buddy list window to all desktops as some
  window managers have trouble to properly unstick it (LP: #346840)
  - debian/patches/11_buddy_list_really_show.patch
* Always use default tray icon size on KDE (LP: #209440)
  - debian/patches/62_tray_icon_size_kde.patch
* Use scrollbars in the preferences dialog if the screen height is
  below 700 px instead of 600 px
  - debian/patches/60_1024x600_gtkprefs.c.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/win32/win32dep.c
326
326
 
327
327
        if (rv != ERROR_SUCCESS) {
328
328
                char *errmsg = g_win32_error_message(rv);
329
 
                purple_debug_info("wpurple", "Could not open reg key '%s' subkey '%s'.\nMessage: (%ld) %s\n",
 
329
                purple_debug_error("wpurple", "Could not open reg key '%s' subkey '%s'.\nMessage: (%ld) %s\n",
330
330
                                        ((rootkey == HKEY_LOCAL_MACHINE) ? "HKLM" :
331
331
                                         (rootkey == HKEY_CURRENT_USER) ? "HKCU" :
332
332
                                          (rootkey == HKEY_CLASSES_ROOT) ? "HKCR" : "???"),
356
356
 
357
357
        if (rv != ERROR_SUCCESS) {
358
358
                char *errmsg = g_win32_error_message(rv);
359
 
                purple_debug_info("wpurple", "Could not read from reg key value '%s'.\nMessage: (%ld) %s\n",
 
359
                purple_debug_error("wpurple", "Could not read from reg key value '%s'.\nMessage: (%ld) %s\n",
360
360
                                        valname, rv, errmsg);
361
361
                g_free(errmsg);
362
362
        }
419
419
void wpurple_init(void) {
420
420
        WORD wVersionRequested;
421
421
        WSADATA wsaData;
422
 
        const char *perlenv;
423
 
        char *newenv;
424
422
 
425
423
        if (!g_thread_supported())
426
424
                g_thread_init(NULL);
444
442
                WSACleanup();
445
443
        }
446
444
 
447
 
        /* Set Environmental Variables */
448
 
        /* Tell perl where to find Purple's perl modules */
449
 
        perlenv = g_getenv("PERL5LIB");
450
 
        newenv = g_strdup_printf("%s%s%s" G_DIR_SEPARATOR_S "perlmod;",
451
 
                perlenv ? perlenv : "",
452
 
                perlenv ? ";" : "",
453
 
                wpurple_install_dir());
454
 
        if (!g_setenv("PERL5LIB", newenv, TRUE))
455
 
                purple_debug_warning("wpurple", "putenv failed for PERL5LIB\n");
456
 
        g_free(newenv);
457
 
 
458
445
        purple_debug_info("wpurple", "wpurple_init end\n");
459
446
}
460
447
 
467
454
        WSACleanup();
468
455
 
469
456
        g_free(app_data_dir);
 
457
        g_free(install_dir);
 
458
        g_free(lib_dir);
 
459
        g_free(locale_dir);
 
460
 
470
461
        app_data_dir = NULL;
 
462
        install_dir = NULL;
 
463
        lib_dir = NULL;
 
464
        locale_dir = NULL;
471
465
 
472
466
        libpurpledll_hInstance = NULL;
473
467
}