Mercurial > pidgin.yaz
changeset 16347:6ab32b8d3246
merge of '6096404018084d5ea24f916c8e757d64e237dbd7'
and 'e50cb51528e4d48fe940dd2aebee80fea945ccd6'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Tue, 24 Apr 2007 05:14:37 +0000 |
| parents | bf353c85959a (diff) bf8c596cf0db (current diff) |
| children | 49e471e56fc7 |
| files | pidgin/pixmaps/emotes/default/22/theme |
| diffstat | 13 files changed, 50 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Tue Apr 24 05:13:40 2007 +0000 +++ b/COPYRIGHT Tue Apr 24 05:14:37 2007 +0000 @@ -213,6 +213,7 @@ Fidel Martinez Lalo Martins John Matthews +Simo Mattila Ryan McCabe Peter McCurdy Kurt McKee
--- a/ChangeLog Tue Apr 24 05:13:40 2007 +0000 +++ b/ChangeLog Tue Apr 24 05:14:37 2007 +0000 @@ -5,9 +5,9 @@ GTK+ UI and Finch for the ncurses based console UI (AOL LLC) Build Changes: - * With the Core/UI split completed, it is now possible to build Pidgin - without any UIs, creating a libpurple library upon which other UIs - may be constructed + * With the Core/UI split complete, it is now possible to build + libpurple without any UIs, creating a library upon which other + UIs may be constructed * A new ncurses-based console UI called Finch is now available (Sadrul Habib Chowdhury, Google Summer of Code) * Reorganized the source tree to split apart the code for the UI @@ -43,7 +43,7 @@ the expander setting in .gtkrc-2.0 is no longer needed * Authorization requests don't popup new dialogs anymore. They are displayed at the bottom of the buddy list instead. - * New mail notifications don't popup new dialogs anymore. The are + * New mail notifications don't popup new dialogs anymore. They are displayed at the top of the buddy list instead. Conversations and Chats:
--- a/libpurple/nat-pmp.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/nat-pmp.c Tue Apr 24 05:14:37 2007 +0000 @@ -64,7 +64,7 @@ typedef struct { uint8_t version; - uint8_t opcode; // 128 + n + uint8_t opcode; /* 128 + n */ uint16_t resultcode; uint32_t epoch; uint32_t address; @@ -417,7 +417,7 @@ bzero(&req, sizeof(PurplePmpMapRequest)); req.version = 0; req.opcode = ((type == PURPLE_PMP_TYPE_UDP) ? PMP_MAP_OPCODE_UDP : PMP_MAP_OPCODE_TCP); - req.privateport = htons(privateport); // What a difference byte ordering makes...d'oh! + req.privateport = htons(privateport); /* What a difference byte ordering makes...d'oh! */ req.publicport = htons(publicport); req.lifetime = htonl(lifetime);
--- a/libpurple/plugins/tcl/tcl_ref.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_ref.c Tue Apr 24 05:14:37 2007 +0000 @@ -114,16 +114,17 @@ char *ptr; PurpleStringref *type; void *value; + int magicnumber = strlen("purple-"); - if (strlen(bytes) < 7 - || strncmp(bytes, "purple-", 7) + if (strlen(bytes) < magicnumber + || strncmp(bytes, "purple-", magicnumber) || (ptr = strchr(bytes, ':')) == NULL - || (ptr - bytes) == 7) + || (ptr - bytes) == magicnumber) goto badobject; /* Bad Ethan */ *ptr = '\0'; - type = purple_stringref_new(bytes + 7); + type = purple_stringref_new(bytes + magicnumber); *ptr = ':'; ptr++;
--- a/libpurple/prefs.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/prefs.c Tue Apr 24 05:14:37 2007 +0000 @@ -92,7 +92,16 @@ if (name[1] == '\0') return &prefs; else - return g_hash_table_lookup(prefs_hash, name); + { + /* When we're initializing, the debug system is + * initialized before the prefs system, but debug + * calls will end up calling prefs functions, so we + * need to deal cleanly here. */ + if (prefs_hash) + return g_hash_table_lookup(prefs_hash, name); + else + return NULL; + } }
--- a/libpurple/protocols/msn/nexus.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/protocols/msn/nexus.c Tue Apr 24 05:14:37 2007 +0000 @@ -159,7 +159,7 @@ g_return_if_fail(session != NULL); if (nexus->input_handler == 0) - //TODO: Use purple_ssl_input_add()? + /* TODO: Use purple_ssl_input_add()? */ nexus->input_handler = purple_input_add(nexus->gsc->fd, PURPLE_INPUT_READ, nexus_login_written_cb, nexus); @@ -402,7 +402,7 @@ char *base, *c; if (nexus->input_handler == 0) - //TODO: Use purple_ssl_input_add()? + /* TODO: Use purple_ssl_input_add()? */ nexus->input_handler = purple_input_add(nexus->gsc->fd, PURPLE_INPUT_READ, nexus_connect_written_cb, nexus);
--- a/libpurple/protocols/oscar/oscar.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Apr 24 05:14:37 2007 +0000 @@ -2898,7 +2898,7 @@ if (userinfo->status[0] != '\0') tmp = oscar_encoding_to_utf8(userinfo->status_encoding, userinfo->status, userinfo->status_len); -#ifdef _WIN32 +#if defined (_WIN32) || defined (__APPLE__) if (userinfo->itmsurl[0] != '\0') { gchar *itmsurl, *tmp2; itmsurl = oscar_encoding_to_utf8(userinfo->itmsurl_encoding,
--- a/libpurple/protocols/qq/qq.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/protocols/qq/qq.c Tue Apr 24 05:14:37 2007 +0000 @@ -399,7 +399,6 @@ gc_and_uid *g; PurpleBuddy *buddy; PurpleConnection *gc; -// const gchar *who = param_who; gfhuang const gchar *who; g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); @@ -503,7 +502,8 @@ } */ -/* TODO: re-enable this +#if 0 +/* TODO: re-enable this */ static void _qq_menu_send_file(PurpleBlistNode * node, gpointer ignored) { PurpleBuddy *buddy; @@ -513,13 +513,13 @@ g_return_if_fail (PURPLE_BLIST_NODE_IS_BUDDY (node)); buddy = (PurpleBuddy *) node; q_bud = (qq_buddy *) buddy->proto_data; -// if (is_online (q_bud->status)) { +/* if (is_online (q_bud->status)) { */ gc = purple_account_get_connection (buddy->account); g_return_if_fail (gc != NULL && gc->proto_data != NULL); qq_send_file(gc, buddy->name, NULL); -// } +/* } */ } -*/ +#endif /* protocol related menus */ static GList *_qq_actions(PurplePlugin *plugin, gpointer context) @@ -575,23 +575,21 @@ return _qq_chat_menu(node); m = NULL; + +/* TODO : not working, temp commented out by gfhuang */ +#if 0 + + act = purple_menu_action_new(_("Block this buddy"), PURPLE_CALLBACK(_qq_menu_block_buddy), NULL, NULL); /* add NULL by gfhuang */ + m = g_list_append(m, act); +/* if (q_bud && is_online(q_bud->status)) { */ + act = purple_menu_action_new(_("Send File"), PURPLE_CALLBACK(_qq_menu_send_file), NULL, NULL); /* add NULL by gfhuang */ + m = g_list_append(m, act); +/* } */ +#endif + return m; } -/* TODO : not working, temp commented out by gfhuang - - act = purple_menu_action_new(_("Block this buddy"), PURPLE_CALLBACK(_qq_menu_block_buddy), NULL, NULL); //add NULL by gfhuang - m = g_list_append(m, act); -// if (q_bud && is_online(q_bud->status)) { - act = purple_menu_action_new(_("Send File"), PURPLE_CALLBACK(_qq_menu_send_file), NULL, NULL); //add NULL by gfhuang - m = g_list_append(m, act); -// } -*/ -/* - return m; -} -*/ - static void _qq_keep_alive(PurpleConnection *gc) {
--- a/libpurple/protocols/qq/send_file.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/protocols/qq/send_file.c Tue Apr 24 05:14:37 2007 +0000 @@ -362,7 +362,7 @@ if (ioctl(fd, SIOCGIFCONF, (char *) &ifc) < 0) return 0; intrface = ifc.ifc_len / sizeof(struct ifreq); for (i = 0; i < intrface; i++) { - //buf[intrface].ifr_name + /* buf[intrface].ifr_name */ if (ioctl(fd, SIOCGIFADDR, (char *) &buf[i]) >= 0) { ret = (((struct sockaddr_in *)(&buf[i].ifr_addr))->sin_addr).s_addr;
--- a/libpurple/win32/giowin32.c Tue Apr 24 05:13:40 2007 +0000 +++ b/libpurple/win32/giowin32.c Tue Apr 24 05:14:37 2007 +0000 @@ -32,7 +32,7 @@ /* Define this to get (very) verbose logging of all channels */ /* #define G_IO_WIN32_DEBUG */ -//#include "config.h" +/* #include "config.h" */ #include <glib.h>
--- a/pidgin/gtkaccount.c Tue Apr 24 05:13:40 2007 +0000 +++ b/pidgin/gtkaccount.c Tue Apr 24 05:14:37 2007 +0000 @@ -333,8 +333,7 @@ if (!g_ascii_strncasecmp(name, "file://", 7)) { GError *converr = NULL; gchar *tmp, *rtmp; - /* It looks like we're dealing with a local file. Let's - * just untar it in the right place */ + /* It looks like we're dealing with a local file. */ if(!(tmp = g_filename_from_uri(name, NULL, &converr))) { purple_debug(PURPLE_DEBUG_ERROR, "buddyicon", "%s\n", (converr ? converr->message :
--- a/pidgin/gtkstatusbox.c Tue Apr 24 05:13:40 2007 +0000 +++ b/pidgin/gtkstatusbox.c Tue Apr 24 05:14:37 2007 +0000 @@ -1273,8 +1273,10 @@ if (event->button != 1) return FALSE; gtk_combo_box_popup(GTK_COMBO_BOX(box)); - // Disabled until button_released_cb works - // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(box->toggle_button), TRUE); + /* Disabled until button_released_cb works */ +#if 0 + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(box->toggle_button), TRUE); +#endif return TRUE; } #endif