Mercurial > pidgin.yaz
changeset 16926:317b12362b71
merge of '15f0eb2e525749743a7089f3d897fb1e8f4f91af'
and '2669d4a238528fc07bcf3987f371a956a9911253'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 05 May 2007 22:45:34 +0000 |
| parents | fdc345732a3d (diff) b93b9994dc2f (current diff) |
| children | 0dcd915899ae |
| files | |
| diffstat | 5 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 05 19:15:44 2007 +0000 +++ b/ChangeLog Sat May 05 22:45:34 2007 +0000 @@ -4,6 +4,13 @@ * Buddy list update speedups when buddy icons are not being displayed. (Scott Wolchok) + Finch: + * Userlist in chat windows, which can be turned on or off using + "/users" command. + * Menus in the conversation windows. + * Improved tab completion support. + * Ctrl+c prompts with a dialog before exiting. + version 2.0.0 (5/3/2007): * The project has new names - libpurple for the core, Pidgin for the GTK+ UI and Finch for the ncurses based console UI (AOL LLC)
--- a/libpurple/internal.h Sat May 05 19:15:44 2007 +0000 +++ b/libpurple/internal.h Sat May 05 22:45:34 2007 +0000 @@ -183,6 +183,7 @@ #define purple_strlcat(dest, src) g_strlcat(dest, src, sizeof(dest)) #define PURPLE_WEBSITE "http://pidgin.im/" +#define PURPLE_DEVEL_WEBSITE "http://developer.pidgin.im/" /* This is for the accounts code to notify the buddy icon code that * it's done loading. We may want to replace this with a signal. */
--- a/pidgin/gtkdocklet.c Sat May 05 19:15:44 2007 +0000 +++ b/pidgin/gtkdocklet.c Sat May 05 22:45:34 2007 +0000 @@ -486,8 +486,8 @@ pidgin_separator(submenu); - new_menu_item_with_status_icon(submenu, _("New..."), PURPLE_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL); - new_menu_item_with_status_icon(submenu, _("Saved..."), PURPLE_STATUS_AVAILABLE, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL); + pidgin_new_item_from_stock(submenu, _("New..."), NULL, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL); + pidgin_new_item_from_stock(submenu, _("Saved..."), NULL, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL); return menuitem; }
--- a/pidgin/gtkmain.c Sat May 05 19:15:44 2007 +0000 +++ b/pidgin/gtkmain.c Sat May 05 22:45:34 2007 +0000 @@ -500,16 +500,16 @@ "no fault of your own.\n\n" "If you can reproduce the crash, please notify the Pidgin\n" "developers by reporting a bug at\n" - "%sbug.php\n\n" + "%snewticket/\n\n" "Please make sure to specify what you were doing at the time\n" "and post the backtrace from the core file. If you do not know\n" "how to get the backtrace, please read the instructions at\n" - "%sgdb.php\n\n" + "%swiki/GetABacktrace\n\n" "If you need further assistance, please IM either SeanEgn or \n" "LSchiere (via AIM). Contact information for Sean and Luke \n" "on other protocols is at\n" - "%scontactinfo.php\n"), - PIDGIN_NAME, PURPLE_WEBSITE, PURPLE_WEBSITE, PURPLE_WEBSITE + "%swiki/DeveloperPages\n"), + PIDGIN_NAME, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE ); /* we have to convert the message (UTF-8 to console
--- a/pidgin/gtksound.c Sat May 05 19:15:44 2007 +0000 +++ b/pidgin/gtksound.c Sat May 05 22:45:34 2007 +0000 @@ -430,7 +430,7 @@ return; } - esc_filename = g_strdup_printf("'%s'", filename); + esc_filename = g_shell_quote(filename); if(strstr(sound_cmd, "%s")) command = purple_strreplace(sound_cmd, "%s", esc_filename);