Mercurial > pidgin.yaz
changeset 16752:81bba936c933
merge of 'c5e7969e6df3aa79a90a1841303171954f97bc53'
and 'f7bc06a1476e3c9e41eb14ce9a3b4bab4fa73dae'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Tue, 01 May 2007 04:10:29 +0000 |
| parents | 8e54f40a60f3 (current diff) bb6cfc641496 (diff) |
| children | 964078401036 |
| files | libpurple/plugins/perl/perl.c |
| diffstat | 24 files changed, 232 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Tue May 01 03:21:27 2007 +0000 +++ b/NEWS Tue May 01 04:10:29 2007 +0000 @@ -51,7 +51,7 @@ and taking care of all of the paperwork and overhead that no one wants to deal with. -2.0.0beta6 (1/17/2006): +2.0.0beta6 (1/17/2007): Sean: Barring any seriously major new issues, we expect this to be the final beta release before 2.0.0. This has a bunch of cool UI changes, some Google Talk features, a bunch new plugins, and other
--- a/libpurple/buddyicon.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/buddyicon.c Tue May 01 04:10:29 2007 +0000 @@ -223,7 +223,7 @@ /* We could make this O(1) by using another hash table, but * this is probably good enough. */ - g_hash_table_foreach_remove(pointer_icon_cache, value_equals, img); + g_hash_table_foreach_remove(pointer_icon_cache, value_equals, (gpointer)img); } }
--- a/libpurple/imgstore.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/imgstore.c Tue May 01 04:10:29 2007 +0000 @@ -98,7 +98,7 @@ return img->size; } -const char *purple_imgstore_get_filename(PurpleStoredImage *img) +const char *purple_imgstore_get_filename(const PurpleStoredImage *img) { g_return_val_if_fail(img != NULL, NULL);
--- a/libpurple/imgstore.h Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/imgstore.h Tue May 01 04:10:29 2007 +0000 @@ -110,7 +110,7 @@ * @return A pointer to the filename, which must not * be freed or modified. */ -const char *purple_imgstore_get_filename(PurpleStoredImage *img); +const char *purple_imgstore_get_filename(const PurpleStoredImage *img); /** * Returns an extension corresponding to the image's file type.
--- a/libpurple/plugins/Makefile.am Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/plugins/Makefile.am Tue May 01 04:10:29 2007 +0000 @@ -26,12 +26,17 @@ autoaccept_la_LDFLAGS = -module -avoid-version buddynote_la_LDFLAGS = -module -avoid-version +ciphertest_la_LDFLAGS = -module -avoid-version +codeinline_la_LDFLAGS = -module -avoid-version idle_la_LDFLAGS = -module -avoid-version joinpart_la_LDFLAGS = -module -avoid-version log_reader_la_LDFLAGS = -module -avoid-version newline_la_LDFLAGS = -module -avoid-version offlinemsg_la_LDFLAGS = -module -avoid-version +pluginpref_example_la_LDFLAGS = -module -avoid-version psychic_la_LDFLAGS = -module -avoid-version +signals_test_la_LDFLAGS = -module -avoid-version +simple_la_LDFLAGS = -module -avoid-version statenotify_la_LDFLAGS = -module -avoid-version # this can't be in a conditional otherwise automake 1.4 yells @@ -51,24 +56,41 @@ statenotify.la \ $(DBUS_LTLIB) +noinst_LTLIBRARIES = \ + ciphertest.la \ + codeinline.la \ + pluginpref_example.la \ + signals_test.la \ + simple.la + autoaccept_la_SOURCES = autoaccept.c buddynote_la_SOURCES = buddynote.c +ciphertest_la_SOURCES = ciphertest.c +codeinline_la_SOURCES = codeinline.c idle_la_SOURCES = idle.c joinpart_la_SOURCES = joinpart.c log_reader_la_SOURCES = log_reader.c newline_la_SOURCES = newline.c offlinemsg_la_SOURCES = offlinemsg.c +pluginpref_example_la_SOURCES = pluginpref_example.c psychic_la_SOURCES = psychic.c +signals_test_la_SOURCES = signals-test.c +simple_la_SOURCES = simple.c statenotify_la_SOURCES = statenotify.c autoaccept_la_LIBADD = $(GLIB_LIBS) buddynote_la_LIBADD = $(GLIB_LIBS) +ciphertest_la_LIBADD = $(GLIB_LIBS) +codeinline_la_LIBADD = $(GLIB_LIBS) idle_la_LIBADD = $(GLIB_LIBS) joinpart_la_LIBADD = $(GLIB_LIBS) log_reader_la_LIBADD = $(GLIB_LIBS) newline_la_LIBADD = $(GLIB_LIBS) offlinemsg_la_LIBADD = $(GLIB_LIBS) +pluginpref_example_la_LIBADD = $(GLIB_LIBS) psychic_la_LIBADD = $(GLIB_LIBS) +signals_test_la_LIBADD = $(GLIB_LIBS) +simple_la_LIBADD = $(GLIB_LIBS) statenotify_la_LIBADD = $(GLIB_LIBS) if ENABLE_DBUS @@ -96,15 +118,11 @@ EXTRA_DIST = \ Makefile.mingw \ - ciphertest.c \ dbus-buddyicons-example.py \ filectl.c \ fortuneprofile.pl \ ipc-test-client.c \ - ipc-test-server.c \ - pluginpref_example.c \ - signals-test.c \ - simple.c + ipc-test-server.c AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \
--- a/libpurple/plugins/ciphertest.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/plugins/ciphertest.c Tue May 01 04:10:29 2007 +0000 @@ -277,6 +277,11 @@ NULL, /**< ui_info */ NULL, /**< extra_info */ NULL, + NULL, + /* padding */ + NULL, + NULL, + NULL, NULL };
--- a/libpurple/plugins/codeinline.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/plugins/codeinline.c Tue May 01 04:10:29 2007 +0000 @@ -82,6 +82,11 @@ NULL, NULL, NULL, + NULL, + /* padding */ + NULL, + NULL, + NULL, NULL };
--- a/libpurple/plugins/perl/perl.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/plugins/perl/perl.c Tue May 01 04:10:29 2007 +0000 @@ -102,9 +102,9 @@ static PurplePluginUiInfo ui_info = { purple_perl_get_plugin_frame, - 0, /* page_num (Reserved) */ + 0, /* page_num (Reserved) */ NULL, /* frame (Reserved) */ - /* padding */ + /* Padding */ NULL, NULL, NULL,
--- a/libpurple/plugins/pluginpref_example.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/plugins/pluginpref_example.c Tue May 01 04:10:29 2007 +0000 @@ -110,7 +110,12 @@ static PurplePluginUiInfo prefs_info = { get_plugin_pref_frame, 0, /* page_num (Reserved) */ - NULL /* frame (Reserved) */ + NULL, /* frame (Reserved) */ + /* Padding */ + NULL, + NULL, + NULL, + NULL }; static PurplePluginInfo info = @@ -141,6 +146,11 @@ NULL, /**< ui_info */ NULL, /**< extra_info */ &prefs_info, /**< prefs_info */ + NULL, /**< actions */ + /* padding */ + NULL, + NULL, + NULL, NULL };
--- a/libpurple/plugins/signals-test.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/plugins/signals-test.c Tue May 01 04:10:29 2007 +0000 @@ -697,6 +697,11 @@ NULL, /**< ui_info */ NULL, /**< extra_info */ NULL, + NULL, + /* Padding */ + NULL, + NULL, + NULL, NULL };
--- a/libpurple/plugins/simple.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/plugins/simple.c Tue May 01 04:10:29 2007 +0000 @@ -50,6 +50,11 @@ NULL, /**< ui_info */ NULL, /**< extra_info */ NULL, + NULL, + /* Padding */ + NULL, + NULL, + NULL, NULL };
--- a/libpurple/protocols/bonjour/bonjour.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Tue May 01 04:10:29 2007 +0000 @@ -405,6 +405,12 @@ NULL, /* whiteboard_prpl_ops */ NULL, /* send_raw */ NULL, /* roomlist_room_serialize */ + + /* padding */ + NULL, + NULL, + NULL, + NULL }; static PurplePluginInfo info = @@ -435,6 +441,12 @@ NULL, /**< ui_info */ &prpl_info, /**< extra_info */ NULL, /**< prefs_info */ + NULL, + + /* padding */ + NULL, + NULL, + NULL, NULL };
--- a/libpurple/protocols/silc/silc.c Tue May 01 03:21:27 2007 +0000 +++ b/libpurple/protocols/silc/silc.c Tue May 01 04:10:29 2007 +0000 @@ -1716,6 +1716,12 @@ silcpurple_wb_set_brush, silcpurple_wb_send, silcpurple_wb_clear, + + /* padding */ + NULL, + NULL, + NULL, + NULL }; static PurplePluginProtocolInfo prpl_info = @@ -1796,6 +1802,12 @@ &silcpurple_wb_ops, /* whiteboard_prpl_ops */ NULL, /* send_raw */ NULL, /* roomlist_room_serialize */ + + /* padding */ + NULL, + NULL, + NULL, + NULL }; static PurplePluginInfo info = @@ -1826,7 +1838,13 @@ NULL, /**< ui_info */ &prpl_info, /**< extra_info */ NULL, /**< prefs_info */ - silcpurple_actions + silcpurple_actions, + + /* padding */ + NULL, + NULL, + NULL, + NULL }; static void
--- a/pidgin.spec.in Tue May 01 03:21:27 2007 +0000 +++ b/pidgin.spec.in Tue May 01 04:10:29 2007 +0000 @@ -84,6 +84,8 @@ Obsoletes: gaim-silc Obsoletes: gaim-tcl Obsoletes: gaim-gadugadu +Obsoletes: pidgin-tcl < 2.0.0 +Obsoletes: pidgin-silc < 2.0.0 %package -n libpurple-devel Summary: Development headers, documentation, and libraries for libpurple
--- a/pidgin/pixmaps/Makefile.mingw Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/pixmaps/Makefile.mingw Tue May 01 04:10:29 2007 +0000 @@ -22,20 +22,8 @@ mkdir -p $(pidginbuttonpixdir); \ cp $(pidginbuttonpix_DATA) $(pidginbuttonpixdir); \ fi; - if test '$(pidgindialogpix_DATA)'; then \ - mkdir -p $(pidgindialogpixdir); \ - cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \ - fi; - if test '$(pidginiconpix_DATA)'; then \ - mkdir -p $(pidginiconpixdir); \ - cp $(pidginiconpix_DATA) $(pidginiconpixdir); \ - fi; if test '$(pidgindistpix_DATA)'; then \ mkdir -p $(pidgindistpixdir); \ cp $(pidgindistpix_DATA) $(pidgindistpixdir); \ fi; -# if test '$(distpixmap_DATA)'; then \ -# mkdir -p $(distpixmapdir); \ -# cp $(distpixmap_DATA) $(distpixmapdir); \ -# fi;
--- a/pidgin/plugins/Makefile.am Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/plugins/Makefile.am Tue May 01 04:10:29 2007 +0000 @@ -27,7 +27,9 @@ plugindir = $(libdir)/pidgin convcolors_la_LDFLAGS = -module -avoid-version +contact_priority_la_LDFLAGS = -module -avoid-version extplacement_la_LDFLAGS = -module -avoid-version +gtk_signals_test_la_LDFLAGS = -module -avoid-version history_la_LDFLAGS = -module -avoid-version iconaway_la_LDFLAGS = -module -avoid-version markerline_la_LDFLAGS = -module -avoid-version @@ -55,8 +57,14 @@ timestamp_format.la \ xmppconsole.la +noinst_LTLIBRARIES = \ + contact_priority.la \ + gtk_signals_test.la + convcolors_la_SOURCES = convcolors.c +contact_priority_la_SOURCES = contact_priority.c extplacement_la_SOURCES = extplacement.c +gtk_signals_test_la_SOURCES = gtk-signals-test.c history_la_SOURCES = history.c iconaway_la_SOURCES = iconaway.c markerline_la_SOURCES = markerline.c @@ -69,7 +77,9 @@ xmppconsole_la_SOURCES = xmppconsole.c convcolors_la_LIBADD = $(GTK_LIBS) +contact_priority_la_LIBADD = $(GTK_LIBS) extplacement_la_LIBADD = $(GTK_LIBS) +gtk_signals_test_la_LIBADD = $(GTK_LIBS) history_la_LIBADD = $(GTK_LIBS) iconaway_la_LIBADD = $(GTK_LIBS) markerline_la_LIBADD = $(GTK_LIBS) @@ -85,8 +95,6 @@ EXTRA_DIST = \ Makefile.mingw \ - contact_priority.c \ - gtk-signals-test.c \ mailchk.c \ pidgininc.c \ raw.c \
--- a/pidgin/plugins/contact_priority.c Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/plugins/contact_priority.c Tue May 01 04:10:29 2007 +0000 @@ -164,7 +164,12 @@ static PidginPluginUiInfo ui_info = { get_config_frame, - 0 /* page_num (Reserved) */ + 0, /* page_num (Reserved) */ + /* Padding */ + NULL, + NULL, + NULL, + NULL }; static PurplePluginInfo info = @@ -194,7 +199,13 @@ &ui_info, /**< ui_info */ NULL, /**< extra_info */ NULL, /**< prefs_info */ - NULL /**< actions */ + NULL, /**< actions */ + + /* padding */ + NULL, + NULL, + NULL, + NULL }; static void
--- a/pidgin/plugins/gevolution/gevolution.c Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Tue May 01 04:10:29 2007 +0000 @@ -503,7 +503,12 @@ static PidginPluginUiInfo ui_info = { get_config_frame, /**< get_config_frame */ - 0 /**< page_num */ + 0, /**< page_num */ + /* Padding */ + NULL, + NULL, + NULL, + NULL }; static PurplePluginInfo info = @@ -534,6 +539,12 @@ &ui_info, /**< ui_info */ NULL, /**< extra_info */ NULL, + NULL, + + /* Padding */ + NULL, + NULL, + NULL, NULL };
--- a/pidgin/plugins/gtk-signals-test.c Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/plugins/gtk-signals-test.c Tue May 01 04:10:29 2007 +0000 @@ -173,6 +173,12 @@ NULL, /**< ui_info */ NULL, /**< extra_info */ NULL, + NULL, + + /* padding */ + NULL, + NULL, + NULL, NULL };
--- a/pidgin/plugins/win32/winprefs/winprefs.c Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Tue May 01 04:10:29 2007 +0000 @@ -1,7 +1,7 @@ /* - * purple - WinPurple Options Plugin + * pidgin - Windows Pidgin Options Plugin * - * Purple is the legal property of its developers, whose names are too numerous + * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * @@ -204,11 +204,11 @@ char *runval = NULL; if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) - runval = g_strdup_printf("%s" G_DIR_SEPARATOR_S "purple.exe", wpurple_install_dir()); + runval = g_strdup_printf("%s" G_DIR_SEPARATOR_S "pidgin.exe", wpurple_install_dir()); - if(!wpurple_write_reg_string(HKEY_CURRENT_USER, RUNKEY, "Purple", runval) + if(!wpurple_write_reg_string(HKEY_CURRENT_USER, RUNKEY, "Pidgin", runval) /* For Win98 */ - && !wpurple_write_reg_string(HKEY_LOCAL_MACHINE, RUNKEY, "Purple", runval)) + && !wpurple_write_reg_string(HKEY_LOCAL_MACHINE, RUNKEY, "Pidgin", runval)) purple_debug_error(WINPREFS_PLUGIN_ID, "Could not set registry key value\n"); g_free(runval); @@ -318,8 +318,8 @@ g_free(tmp); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - if ((run_key_val = wpurple_read_reg_string(HKEY_CURRENT_USER, RUNKEY, "Purple")) - || (run_key_val = wpurple_read_reg_string(HKEY_LOCAL_MACHINE, RUNKEY, "Purple"))) { + if ((run_key_val = wpurple_read_reg_string(HKEY_CURRENT_USER, RUNKEY, "Pidgin")) + || (run_key_val = wpurple_read_reg_string(HKEY_LOCAL_MACHINE, RUNKEY, "Pidgin"))) { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); g_free(run_key_val); } @@ -372,7 +372,7 @@ NULL, PURPLE_PRIORITY_DEFAULT, WINPREFS_PLUGIN_ID, - N_("Pidgwin Options"), + N_("Windows Pidgin Options"), VERSION, N_("Options specific to Pidgin for Windows."), N_("Provides options specific to Pidgin for Windows , such as buddy list docking."),
--- a/pidgin/win32/nsis/pidgin-installer.nsi Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Tue May 01 04:10:29 2007 +0000 @@ -155,6 +155,7 @@ !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "Afrikaans" !insertmacro MUI_LANGUAGE "Albanian" !insertmacro MUI_LANGUAGE "Bulgarian" !insertmacro MUI_LANGUAGE "Catalan" @@ -192,6 +193,7 @@ !include "${PIDGIN_NSIS_INCLUDE_PATH}\langmacros.nsh" + !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "AFRIKAANS" "${PIDGIN_NSIS_INCLUDE_PATH}\translations\afrikaans.nsh" !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ALBANIAN" "${PIDGIN_NSIS_INCLUDE_PATH}\translations\albanian.nsh" !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BULGARIAN" "${PIDGIN_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh" !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CATALAN" "${PIDGIN_NSIS_INCLUDE_PATH}\translations\catalan.nsh"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/win32/nsis/translations/afrikaans.nsh Tue May 01 04:10:29 2007 +0000 @@ -0,0 +1,83 @@ +;; +;; afrikaans.nsh +;; +;; Default language strings for the Windows Pidgin NSIS installer. +;; Windows Code page: 1252 +;; +;; Version 3 + +; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in +; langmacros.nsh when updating this file + +; Startup Checks +!define INSTALLER_IS_RUNNING "Die installeerder loop reeds." +!define PIDGIN_IS_RUNNING "Pidgin loop reeds êrens. Verlaat Pidgin eers en probeer dan weer." +!define GTK_INSTALLER_NEEDED "Die GTK+-looptydomgewing is óf soek óf moet opgegradeer word.$\rInstalleer asb. v{GTK_MIN_VERSION} of hoër van die GTK+-looptyd" + +; License Page +!define PIDGIN_LICENSE_BUTTON "Volgende >" +!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) word vrygestel onderhewig aan die GNU General Public License (GPL). Die lisensie word hier slegs vir kennisname verskaf. $_CLICK" + +; Components Page +!define PIDGIN_SECTION_TITLE "Pidgin-kitsboodskapkliënt (benodigd)" +!define GTK_SECTION_TITLE "GTK+-looptydomgewing (benodigd)" +!define PIDGIN_SHORTCUTS_SECTION_TITLE "Kortpaaie" +!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Werkskerm" +!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Begin-kieslys" +!define PIDGIN_SECTION_DESCRIPTION "Kern-Pidgin-lêers en DLL'e" +!define GTK_SECTION_DESCRIPTION "Multi-platform-gereedskap vir programkoppelvlakke, gebruik deur Pidgin" +!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Kortpaaie om Pidgin mee te begin" +!define PIDGIN_DESKTOP_SHORTCUT_DESC "Skep 'n kortpad na Pidgin op die werkskerm" +!define PIDGIN_STARTMENU_SHORTCUT_DESC "Skep 'n Begin-kieslysinskrywing vir Pidgin" + +; GTK+ Directory Page +!define GTK_UPGRADE_PROMPT "'n Ou weergawe van die GTK+-looptyd is gevind. Wil u opgradeer?$\rLet wel: $(^Name) werk dalk net as u so maak." +!define GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me is onversoenbaar met GTK+ 2.8.0 en nuwer. GTK+ ${GTK_INSTALL_VERSION} sal nie installeer nie.$\rIndien u nie GTK+ ${GTK_MIN_VERSION} of nuwer reeds geïnstalleer het nie, sal die installasie nou staak." + +; Installer Finish Page +!define PIDGIN_FINISH_VISIT_WEB_SITE "Besoek die WinPidgin-webblad" + +; Pidgin Section Prompts and Texts +!define PIDGIN_UNINSTALL_DESC "$(^Name) (slegs verwydering)" +!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Kan nie die tans geïnstalleerde weergawe van Pidgin verwyder nie. Die nuwe weergawe sal geïnstalleer word sonder om die huidige een te verwyder." + +; GTK+ Section Prompts +!define GTK_INSTALL_ERROR "Fout met installering van GTK+-looptyd." +!define GTK_BAD_INSTALL_PATH "Die pad wat u verskaf het, is ontoeganklik of kan nie geskep word nie." + +; URL Handler section +!define URI_HANDLERS_SECTION_TITLE "URI-hanteerders" + +; Uninstall Section Prompts +!define un.PIDGIN_UNINSTALL_ERROR_1 "Kon nie register-inskrywings vir Piding kry tydens verwydering nie.$\rDit is waarskynlik dat 'n ander gebruiker hierdie program geïnstalleer het." +!define un.PIDGIN_UNINSTALL_ERROR_2 "U het nie toestemming om hierdie toepassing te verwyder nie." + +; Spellcheck Section Prompts +!define PIDGIN_SPELLCHECK_SECTION_TITLE "Speltoets-ondersteuning" +!define PIDGIN_SPELLCHECK_ERROR "Fout met installering van speltoetser" +!define PIDGIN_SPELLCHECK_DICT_ERROR "Fout met installering van speltoetswoordeboek" +!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Ondersteuning vir speltoeter. (Internetverbinding benodigd vir installasie)" +!define ASPELL_INSTALL_FAILED "Installasie het misluk" +!define PIDGIN_SPELLCHECK_BRETON "Bretons" +!define PIDGIN_SPELLCHECK_CATALAN "Katalaans" +!define PIDGIN_SPELLCHECK_CZECH "Tsjeggies" +!define PIDGIN_SPELLCHECK_WELSH "Wallies" +!define PIDGIN_SPELLCHECK_DANISH "Deens" +!define PIDGIN_SPELLCHECK_GERMAN "Duits" +!define PIDGIN_SPELLCHECK_GREEK "Grieks" +!define PIDGIN_SPELLCHECK_ENGLISH "Engels" +!define PIDGIN_SPELLCHECK_ESPERANTO "Esperanto" +!define PIDGIN_SPELLCHECK_SPANISH "Spaans" +!define PIDGIN_SPELLCHECK_FAROESE "Faroëes" +!define PIDGIN_SPELLCHECK_FRENCH "Frans" +!define PIDGIN_SPELLCHECK_ITALIAN "Italiaans" +!define PIDGIN_SPELLCHECK_DUTCH "Nederlands" +!define PIDGIN_SPELLCHECK_NORWEGIAN "Noorweegs" +!define PIDGIN_SPELLCHECK_POLISH "Pools" +!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugees" +!define PIDGIN_SPELLCHECK_ROMANIAN "Roemeens" +!define PIDGIN_SPELLCHECK_RUSSIAN "Russies" +!define PIDGIN_SPELLCHECK_SLOVAK "Slowaaks" +!define PIDGIN_SPELLCHECK_SWEDISH "Sweeds" +!define PIDGIN_SPELLCHECK_UKRAINIAN "Oekraïens" +
--- a/pidgin/win32/winpidgin.c Tue May 01 03:21:27 2007 +0000 +++ b/pidgin/win32/winpidgin.c Tue May 01 04:10:29 2007 +0000 @@ -136,11 +136,11 @@ if (path) { /* Set up the settings dir base to be \\path\to - * The actual settings dir will be \\path\to\.pidgin */ - char settingsdir[strlen(path) + strlen("PIDGINHOME=") + 1]; + * The actual settings dir will be \\path\to\.purple */ + char settingsdir[strlen(path) + strlen("PURPLEHOME=") + 1]; char aspelldir[strlen(path) + strlen("PIDGIN_ASPELL_DIR=\\Aspell\\bin") + 1]; - snprintf(settingsdir, sizeof(settingsdir), "PIDGINHOME=%s", path); + snprintf(settingsdir, sizeof(settingsdir), "PURPLEHOME=%s", path); printf("Setting settings dir: %s\n", settingsdir); putenv(settingsdir);
--- a/po/ChangeLog Tue May 01 03:21:27 2007 +0000 +++ b/po/ChangeLog Tue May 01 04:10:29 2007 +0000 @@ -1,7 +1,8 @@ -Gaim: The Pimpin' Penguin IM Clone that's good for the soul! +Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.0.0: * Afrikaans translation added (Friedel Wolff) + * Afrikaans win32 translation added (Friedel Wolff) * Albanian translation updated (Besnik Bleta) * Arabic translation added (Mohamed Magdy) * Bengali translation added (Indranil Das Gupta, Samia Nimatullah,