Mercurial > pidgin.yaz
changeset 23603:05d3447fb34e
disapproval of revision '3d39da6c8014095cac3a0741bf6fc26219e7aff8'
line wrap: on
line diff
--- a/ChangeLog.win32 Thu Jul 17 04:38:07 2008 +0000 +++ b/ChangeLog.win32 Thu Jul 17 04:49:35 2008 +0000 @@ -1,5 +1,5 @@ version 2.4.3 (07/01/2008): - * Upgrade SILC to use the 1.1.7 toolkit + * No changes version 2.4.2 (05/17/2008): * No changes
--- a/libpurple/Makefile.mingw Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/Makefile.mingw Thu Jul 17 04:49:35 2008 +0000 @@ -123,7 +123,7 @@ $(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) $(TARGET).dll $(TARGET).dll.a: $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a,--exclude-libs -o $(TARGET).dll + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll ## ## CLEAN RULES
--- a/libpurple/connection.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/connection.c Thu Jul 17 04:49:35 2008 +0000 @@ -534,9 +534,6 @@ if (gc->disconnect_timeout) return; - purple_debug_info("connection", "Disconnecting connection %p with reason %s (%d)\n", - gc, description, reason); - gc->wants_to_die = purple_connection_error_is_fatal (reason); ops = purple_connections_get_ui_ops();
--- a/libpurple/example/nullclient.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/example/nullclient.c Thu Jul 17 04:49:35 2008 +0000 @@ -27,12 +27,7 @@ #include <signal.h> #include <string.h> -#ifndef _WIN32 #include <unistd.h> -#else -#include "win32/win32dep.h" -#endif - #include "defines.h" @@ -85,11 +80,7 @@ if (condition & PURPLE_INPUT_WRITE) cond |= PURPLE_GLIB_WRITE_COND; -#if defined _WIN32 && !defined WINPIDGIN_USE_GLIB_IO_CHANNEL - channel = wpurple_g_io_channel_win32_new_socket(fd); -#else channel = g_io_channel_unix_new(fd); -#endif closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond, purple_glib_io_invoke, closure, purple_glib_io_destroy); @@ -262,14 +253,12 @@ PurpleSavedStatus *status; char *res; -#ifndef _WIN32 /* libpurple's built-in DNS resolution forks processes to perform * blocking lookups without blocking the main process. It does not * handle SIGCHLD itself, so if the UI does not you quickly get an army * of zombie subprocesses marching around. */ signal(SIGCHLD, SIG_IGN); -#endif init_libpurple(); @@ -305,8 +294,7 @@ account = purple_account_new(name, prpl); /* Get the password for the account */ - //password = getpass("Password: "); - password = ""; + password = getpass("Password: "); purple_account_set_password(account, password); /* It's necessary to enable the account first. */
--- a/libpurple/protocols/Makefile.mingw Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/Makefile.mingw Thu Jul 17 04:49:35 2008 +0000 @@ -8,7 +8,7 @@ PIDGIN_TREE_TOP := ../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak -SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour myspace +SUBDIRS = gg irc jabber msnp9 novell null oscar qq sametime silc simple yahoo bonjour myspace .PHONY: all install clean
--- a/libpurple/protocols/bonjour/bonjour_ft.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/bonjour/bonjour_ft.c Thu Jul 17 04:49:35 2008 +0000 @@ -300,8 +300,6 @@ } if (xf->proxy_connection != NULL) purple_proxy_connect_cancel(xf->proxy_connection); - if (xf->proxy_info != NULL) - purple_proxy_info_destroy(xf->proxy_info); if (xf->listen_data != NULL) purple_network_listen_cancel(xf->listen_data); g_free(xf->iq_id); @@ -804,8 +802,6 @@ xmlnode *q_node, *tmp_node; BonjourData *bd; - xf->proxy_connection = NULL; - if(source < 0) { purple_debug_error("bonjour", "Error connecting via SOCKS5 - %s\n", error_message ? error_message : "(null)"); @@ -819,6 +815,9 @@ bd = xf->data; + purple_proxy_info_destroy(xf->proxy_info); + xf->proxy_connection = NULL; + xf->proxy_info = NULL; /* Here, start the file transfer.*/ /* Notify Initiator of Connection */ @@ -872,6 +871,8 @@ xep_ft_si_reject(xf->data, xf->iq_id, xfer->who, "404", "cancel"); /* Cancel the connection */ purple_xfer_cancel_local(xfer); + /*purple_proxy_info_destroy(xf->proxy_info); + xf->proxy_info = NULL;*/ } }
--- a/libpurple/protocols/jabber/Makefile.mingw Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/jabber/Makefile.mingw Thu Jul 17 04:49:35 2008 +0000 @@ -125,7 +125,7 @@ $(OBJECTS): $(PURPLE_CONFIG_H) $(TARGET).dll $(TARGET).dll.a: $(PURPLE_DLL).a $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll $(XMPP_TARGET).dll: $(TARGET).dll.a $(XMPP_OBJECTS) $(CC) -shared $(XMPP_OBJECTS) $(LIB_PATHS) $(LIBS) -ljabber $(DLL_LD_FLAGS) -o $(XMPP_TARGET).dll
--- a/libpurple/protocols/jabber/caps.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/jabber/caps.c Thu Jul 17 04:49:35 2008 +0000 @@ -113,11 +113,6 @@ jabber_caps_load(); } -void jabber_caps_uninit(void) { - g_hash_table_destroy(capstable); - capstable = NULL; -} - static void jabber_caps_load(void) { xmlnode *capsdata = purple_util_read_xml_from_file(JABBER_CAPS_FILENAME, "XMPP capabilities cache"); xmlnode *client;
--- a/libpurple/protocols/jabber/caps.h Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/jabber/caps.h Thu Jul 17 04:49:35 2008 +0000 @@ -42,7 +42,6 @@ typedef void (*jabber_caps_get_info_cb)(JabberCapsClientInfo *info, gpointer user_data); void jabber_caps_init(void); -void jabber_caps_uninit(void); void jabber_caps_get_info(JabberStream *js, const char *who, const char *node, const char *ver, const char *ext, jabber_caps_get_info_cb cb, gpointer user_data); void jabber_caps_free_clientinfo(JabberCapsClientInfo *clientinfo);
--- a/libpurple/protocols/jabber/jabber.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Thu Jul 17 04:49:35 2008 +0000 @@ -61,7 +61,6 @@ static PurplePlugin *my_protocol = NULL; GList *jabber_features = NULL; -static GSList *registered_commands = NULL; static void jabber_unregister_account_cb(JabberStream *js); @@ -1391,15 +1390,6 @@ js->idle = idle ? time(NULL) - idle : idle; } -void jabber_features_uninit(void) { - for(; jabber_features; jabber_features = g_list_delete_link(jabber_features, jabber_features)) { - JabberFeature *feat = (JabberFeature*)jabber_features->data; - g_free(feat->shortname); - g_free(feat->namespace); - g_free(feat); - } -} - void jabber_add_feature(const char *shortname, const char *namespace, JabberFeatureEnabled cb) { JabberFeature *feat; @@ -2348,126 +2338,88 @@ return TRUE; } -void jabber_unregister_commands(void) { - for(; registered_commands; registered_commands = g_slist_delete_link(registered_commands, registered_commands)) { - purple_cmd_unregister(GPOINTER_TO_INT(registered_commands->data)); - } -} - void jabber_register_commands(void) { - PurpleCmdId cid; - - cid = purple_cmd_register("config", "", PURPLE_CMD_P_PRPL, + purple_cmd_register("config", "", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-jabber", jabber_cmd_chat_config, _("config: Configure a chat room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("configure", "", PURPLE_CMD_P_PRPL, + purple_cmd_register("configure", "", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-jabber", jabber_cmd_chat_config, _("configure: Configure a chat room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("nick", "s", PURPLE_CMD_P_PRPL, + purple_cmd_register("nick", "s", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-jabber", jabber_cmd_chat_nick, _("nick <new nickname>: Change your nickname."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("part", "s", PURPLE_CMD_P_PRPL, + purple_cmd_register("part", "s", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_part, _("part [room]: Leave the room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("register", "", PURPLE_CMD_P_PRPL, + purple_cmd_register("register", "", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-jabber", jabber_cmd_chat_register, _("register: Register with a chat room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); /* XXX: there needs to be a core /topic cmd, methinks */ - cid = purple_cmd_register("topic", "s", PURPLE_CMD_P_PRPL, + purple_cmd_register("topic", "s", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_topic, _("topic [new topic]: View or change the topic."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("ban", "ws", PURPLE_CMD_P_PRPL, + purple_cmd_register("ban", "ws", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_ban, _("ban <user> [reason]: Ban a user from the room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL, + purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_affiliate, _("affiliate <user> <owner|admin|member|outcast|none>: Set a user's affiliation with the room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("role", "ws", PURPLE_CMD_P_PRPL, + purple_cmd_register("role", "ws", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_role, _("role <user> <moderator|participant|visitor|none>: Set a user's role in the room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("invite", "ws", PURPLE_CMD_P_PRPL, + purple_cmd_register("invite", "ws", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_invite, _("invite <user> [message]: Invite a user to the room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("join", "ws", PURPLE_CMD_P_PRPL, + purple_cmd_register("join", "ws", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_join, _("join: <room> [password]: Join a chat on this server."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL, + purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_kick, _("kick <user> [reason]: Kick a user from the room."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("msg", "ws", PURPLE_CMD_P_PRPL, + purple_cmd_register("msg", "ws", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-jabber", jabber_cmd_chat_msg, _("msg <user> <message>: Send a private message to another user."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("ping", "w", PURPLE_CMD_P_PRPL, + purple_cmd_register("ping", "w", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-jabber", jabber_cmd_ping, _("ping <jid>: Ping a user/component/server."), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); - cid = purple_cmd_register("buzz", "s", PURPLE_CMD_P_PRPL, + purple_cmd_register("buzz", "s", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY, "prpl-jabber", jabber_cmd_buzz, _("buzz: Buzz a user to get their attention"), NULL); - if (cid > 0) - registered_commands = g_slist_prepend(registered_commands, GINT_TO_POINTER(cid)); } void
--- a/libpurple/protocols/jabber/jabber.h Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.h Thu Jul 17 04:49:35 2008 +0000 @@ -242,7 +242,6 @@ */ char *jabber_parse_error(JabberStream *js, xmlnode *packet, PurpleConnectionError *reason); -void jabber_features_uninit(void); void jabber_add_feature(const gchar *shortname, const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */ void jabber_remove_feature(const gchar *shortname); @@ -267,7 +266,6 @@ int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len); GList *jabber_actions(PurplePlugin *plugin, gpointer context); void jabber_register_commands(void); -void jabber_unregister_commands(void); void jabber_init_plugin(PurplePlugin *plugin); #endif /* _PURPLE_JABBER_H_ */
--- a/libpurple/protocols/jabber/pep.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/jabber/pep.c Thu Jul 17 04:49:35 2008 +0000 @@ -39,13 +39,6 @@ } } -void jabber_pep_uninit(void) { - /* TODO: This should be removing the feature registered by jabber_add_feature(), - * but I don't see a good way of doing that right now. */ - g_hash_table_destroy(pep_handlers); - pep_handlers = NULL; -} - void jabber_pep_init_actions(GList **m) { /* register the PEP-specific actions */ jabber_mood_init_action(m);
--- a/libpurple/protocols/msn/msn.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/msn/msn.c Thu Jul 17 04:49:35 2008 +0000 @@ -1343,7 +1343,6 @@ if (group_id >= 0) { - /* This is wrong... user->group_ids contains g_strdup()'d data now */ user->group_ids = g_list_append(user->group_ids, GINT_TO_POINTER(group_id)); }
--- a/libpurple/protocols/msn/msn.h Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/msn/msn.h Thu Jul 17 04:49:35 2008 +0000 @@ -28,7 +28,7 @@ /* #define MSN_DEBUG_SLPMSG 1 */ /* #define MSN_DEBUG_HTTP 1 */ -#define MSN_DEBUG_SLP 1 +/* #define MSN_DEBUG_SLP 1 */ /* #define MSN_DEBUG_SLP_VERBOSE 1 */ /* #define MSN_DEBUG_SLP_FILES 1 */
--- a/libpurple/protocols/msn/user.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/msn/user.c Thu Jul 17 04:49:35 2008 +0000 @@ -235,19 +235,21 @@ /*add group id to User object*/ void -msn_user_add_group_id(MsnUser *user, const char* group_id) +msn_user_add_group_id(MsnUser *user, const char* id) { MsnUserList *userlist; PurpleAccount *account; PurpleBuddy *b; PurpleGroup *g; const char *passport; + char *group_id; const char *group_name; g_return_if_fail(user != NULL); - g_return_if_fail(group_id != NULL); + g_return_if_fail(id != NULL); - user->group_ids = g_list_append(user->group_ids, g_strdup(group_id)); + group_id = g_strdup(id); + user->group_ids = g_list_append(user->group_ids, group_id); userlist = user->userlist; account = userlist->session->account; @@ -259,7 +261,7 @@ g = purple_find_group(group_name); - if ((group_id == NULL) && (g == NULL)) + if ((id == NULL) && (g == NULL)) { g = purple_group_new(group_name); purple_blist_add_group(g, NULL);
--- a/libpurple/protocols/oscar/Makefile.mingw Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/oscar/Makefile.mingw Thu Jul 17 04:49:35 2008 +0000 @@ -109,7 +109,7 @@ $(OBJECTS): $(PURPLE_CONFIG_H) $(TARGET).dll.a $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll $(AIM_TARGET).dll: $(TARGET).dll.a $(AIM_OBJECTS) $(CC) -shared $(AIM_OBJECTS) $(LIB_PATHS) $(LIBS) -loscar $(DLL_LD_FLAGS) -o $(AIM_TARGET).dll
--- a/libpurple/protocols/silc/Makefile.mingw Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/silc/Makefile.mingw Thu Jul 17 04:49:35 2008 +0000 @@ -79,7 +79,7 @@ $(OBJECTS): $(PURPLE_CONFIG_H) $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x74000000 -o $(TARGET).dll + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x64000000 -o $(TARGET).dll ## ## CLEAN RULES
--- a/libpurple/protocols/yahoo/yahoo.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Thu Jul 17 04:49:35 2008 +0000 @@ -148,14 +148,6 @@ gboolean unicode = FALSE; char *message = NULL; - if (pkt->service == YAHOO_SERVICE_LOGON && pkt->status == -1) { - if (!purple_account_get_remember_password(account)) - purple_account_set_password(account, NULL); - purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NAME_IN_USE, - _("System is busy, please try again later.")); - return; - } - if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) { if (!purple_account_get_remember_password(account)) purple_account_set_password(account, NULL);
--- a/libpurple/protocols/zephyr/ZSendPkt.c Thu Jul 17 04:38:07 2008 +0000 +++ b/libpurple/protocols/zephyr/ZSendPkt.c Thu Jul 17 04:49:35 2008 +0000 @@ -5,12 +5,12 @@ * * Copyright (c) 1987,1991 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" #ifdef WIN32 -#include <winsock2.h> +#include <winsock.h> #else #include <sys/socket.h> #endif @@ -25,19 +25,19 @@ Code_t retval; struct sockaddr_in dest; ZNotice_t notice, acknotice; - + if (!packet || len < 0) return (ZERR_ILLVAL); if (len > Z_MAXPKTLEN) return (ZERR_PKTLEN); - + if (ZGetFD() < 0) if ((retval = ZOpenPort((unsigned short *)0)) != ZERR_NONE) return (retval); dest = ZGetDestAddr(); - + if (sendto(ZGetFD(), packet, len, 0, (struct sockaddr *)&dest, sizeof(dest)) < 0) return (errno); @@ -47,7 +47,7 @@ if ((retval = ZParseNotice(packet, len, ¬ice)) != ZERR_NONE) return (retval); - + retval = Z_WaitForNotice (&acknotice, wait_for_hmack, ¬ice.z_uid, HM_TIMEOUT); if (retval == ETIMEDOUT)
--- a/pidgin/gtkblist.h Thu Jul 17 04:38:07 2008 +0000 +++ b/pidgin/gtkblist.h Thu Jul 17 04:49:35 2008 +0000 @@ -194,14 +194,11 @@ void pidgin_blist_update_refresh_timeout(void); /** - * Returns the blist emblem. - * - * This may be an existing pixbuf that has been given an additional ref, - * so it shouldn't be modified. + * Returns the blist emblem * * @param node The node to return an emblem for * - * @return A GdkPixbuf for the emblem to show, or NULL + * @return A newly created GdkPixbuf, or NULL */ GdkPixbuf * pidgin_blist_get_emblem(PurpleBlistNode *node);
--- a/pidgin/gtkcertmgr.c Thu Jul 17 04:38:07 2008 +0000 +++ b/pidgin/gtkcertmgr.c Thu Jul 17 04:49:35 2008 +0000 @@ -57,7 +57,7 @@ PurpleCertificatePool *tls_peers; } tls_peers_mgmt_data; -static tls_peers_mgmt_data *tpm_dat = NULL; +tls_peers_mgmt_data *tpm_dat = NULL; /* Columns See http://developer.gnome.org/doc/API/2.0/gtk/TreeWidget.html */ @@ -113,7 +113,7 @@ static void tls_peers_mgmt_mod_cb(PurpleCertificatePool *pool, const gchar *id, gpointer data) { - g_return_if_fail(pool == tpm_dat->tls_peers); + g_assert (pool == tpm_dat->tls_peers); tls_peers_mgmt_repopulate_list(); } @@ -234,7 +234,7 @@ { PurpleCertificate *crt = (PurpleCertificate *) data; - g_return_if_fail(filename); + g_assert(filename); if (!purple_certificate_export(filename, crt)) { /* Errors! Oh no! */ @@ -617,6 +617,7 @@ g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(certmgr_close_cb), dlg); + /* TODO: Retrieve the user-set window size and use it */ gtk_window_set_default_size(GTK_WINDOW(win), 400, 400); @@ -647,12 +648,10 @@ void pidgin_certmgr_hide(void) { -printf("pidgin_certmgr_hide\n"); /* If it isn't open, do nothing */ if (certmgr_dialog == NULL) { return; } -printf("pidgin_certmgr_hide - ref_count=%d\n", G_OBJECT(certmgr_dialog->window)->ref_count); purple_signals_disconnect_by_handle(certmgr_dialog); purple_prefs_disconnect_by_handle(certmgr_dialog);
--- a/pidgin/gtkdocklet.c Thu Jul 17 04:38:07 2008 +0000 +++ b/pidgin/gtkdocklet.c Thu Jul 17 04:49:35 2008 +0000 @@ -95,10 +95,6 @@ PIDGIN_UNSEEN_TEXT, FALSE, max); - /* Short circuit if we have our information already */ - if (max == 1 && l_im != NULL) - return l_im; - l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT, PIDGIN_UNSEEN_NICK, FALSE, max); @@ -634,7 +630,6 @@ } - static void docklet_plugin_actions(GtkWidget *menu) { @@ -670,6 +665,7 @@ if(c>0) pidgin_separator(menu); } + static void docklet_menu(void) {
--- a/pidgin/gtkstatusbox.c Thu Jul 17 04:38:07 2008 +0000 +++ b/pidgin/gtkstatusbox.c Thu Jul 17 04:49:35 2008 +0000 @@ -203,8 +203,8 @@ const PurpleStatusType *statustype = NULL; const char *message; - statustype = purple_status_type_find_with_id(purple_account_get_status_types(account), - purple_status_type_get_id(purple_status_get_type(newstatus))); + statustype = purple_status_type_find_with_id((GList *)purple_account_get_status_types(account), + (char *)purple_status_type_get_id(purple_status_get_type(newstatus))); for (l = purple_account_get_status_types(account); l != NULL; l = l->next) { PurpleStatusType *status_type = (PurpleStatusType *)l->data; @@ -376,7 +376,7 @@ icon_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, PidginStatusBox *box) { gdk_window_set_cursor(widget->window, box->arrow_cursor); - gtk_image_set_from_pixbuf(GTK_IMAGE(box->icon), box->buddy_icon); + gtk_image_set_from_pixbuf(GTK_IMAGE(box->icon), box->buddy_icon) ; return FALSE; }
--- a/pidgin/minidialog.c Thu Jul 17 04:38:07 2008 +0000 +++ b/pidgin/minidialog.c Thu Jul 17 04:49:35 2008 +0000 @@ -63,7 +63,7 @@ sizeof (PidginMiniDialog), 0, /* n_preallocs */ (GInstanceInitFunc) pidgin_mini_dialog_init, - NULL /* value_table */ + NULL, }; g_define_type_id = g_type_register_static (GTK_TYPE_VBOX, "PidginMiniDialog", &g_define_type_info, 0);
--- a/pidgin/plugins/win32/winprefs/gtkappbar.h Thu Jul 17 04:38:07 2008 +0000 +++ b/pidgin/plugins/win32/winprefs/gtkappbar.h Thu Jul 17 04:49:35 2008 +0000 @@ -33,7 +33,7 @@ /** The rectangle of the screen area used for docking */ RECT docked_rect; /** The height of the window prior to docking */ - int undocked_height; + UINT undocked_height; /** The side of the screen to which the window is docked*/ UINT side; /** Is the window currently docked? */
--- a/pidgin/win32/winpidgin.c Thu Jul 17 04:38:07 2008 +0000 +++ b/pidgin/win32/winpidgin.c Thu Jul 17 04:49:35 2008 +0000 @@ -89,8 +89,9 @@ const char *err_msg = get_win32_error_message(retv); printf("Could not read reg key '%s' subkey '%s' value: '%s'.\nMessage: (%ld) %s\n", - (key == HKEY_LOCAL_MACHINE) ? "HKLM" - : ((key == HKEY_CURRENT_USER) ? "HKCU" : "???"), + ((key == HKEY_LOCAL_MACHINE) ? "HKLM" : + (key == HKEY_CURRENT_USER) ? "HKCU" : + "???"), sub_key, val_name, retv, err_msg); } RegCloseKey(hkey); @@ -215,13 +216,13 @@ /* Set up the settings dir base to be \\path\to * The actual settings dir will be \\path\to\.purple */ - _snprintf(path2, sizeof(path2), "PURPLEHOME=%s", path); + snprintf(path2, sizeof(path2), "PURPLEHOME=%s", path); printf("Setting settings dir: %s\n", path2); - _putenv(path2); + putenv(path2); - _snprintf(path2, sizeof(path2), "PIDGIN_ASPELL_DIR=%s\\Aspell\\bin", path); + snprintf(path2, sizeof(path2), "PIDGIN_ASPELL_DIR=%s\\Aspell\\bin", path); printf("%s\n", path2); - _putenv(path2); + putenv(path2); /* set the GTK+ path to be \\path\to\GTK\bin */ strcat(path, "\\GTK\\bin"); @@ -320,7 +321,7 @@ break; case LANG_PUNJABI: posix = "pa"; break; case LANG_POLISH: posix = "pl"; break; -// case LANG_PASHTO: posix = "ps"; break; + case LANG_PASHTO: posix = "ps"; break; case LANG_PORTUGUESE: switch (sub_id) { case SUBLANG_PORTUGUESE_BRAZILIAN: @@ -436,9 +437,9 @@ locale = winpidgin_get_locale(); - _snprintf(envstr, 25, "LANG=%s", locale); + snprintf(envstr, 25, "LANG=%s", locale); printf("Setting locale: %s\n", envstr); - _putenv(envstr); + putenv(envstr); } #define PIDGIN_WM_FOCUS_REQUEST (WM_APP + 13) @@ -477,7 +478,7 @@ static void handle_protocol(char *cmd) { char *remote_msg, *tmp1, *tmp2; - SIZE_T len; + int len; SIZE_T len_written; HWND msg_win; DWORD pid; @@ -597,10 +598,10 @@ } else { DWORD dw = GetLastError(); const char *err_msg = get_win32_error_message(dw); - _snprintf(errbuf, 512, + snprintf(errbuf, 512, "Error getting module filename.\nError: (%u) %s", (UINT) dw, err_msg); - printf("%s\n", errbuf); + printf("%s", errbuf); MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST); pidgin_dir[0] = '\0'; } @@ -644,11 +645,11 @@ BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND); const char *err_msg = get_win32_error_message(dw); - _snprintf(errbuf, 512, "Error loading pidgin.dll.\nError: (%u) %s%s%s", + snprintf(errbuf, 512, "Error loading pidgin.dll.\nError: (%u) %s%s%s", (UINT) dw, err_msg, mod_not_found ? "\n" : "", mod_not_found ? "This probably means that GTK+ can't be found." : ""); - printf("%s\n", errbuf); + printf("%s", errbuf); MessageBox(NULL, errbuf, TEXT("Error"), MB_OK | MB_TOPMOST); return 0;
--- a/po/Makefile.mingw Thu Jul 17 04:38:07 2008 +0000 +++ b/po/Makefile.mingw Thu Jul 17 04:49:35 2008 +0000 @@ -22,7 +22,7 @@ ## .po.gmo: - rm -f $@ && $(GMSGFMT) -c --statistics -o $@ $< + rm -f $@ && $(GMSGFMT) --statistics -o $@ $< ## ## TARGETS
--- a/po/pl.po Thu Jul 17 04:38:07 2008 +0000 +++ b/po/pl.po Thu Jul 17 04:49:35 2008 +0000 @@ -169,9 +169,9 @@ #. Save button #. Save -#: ../finch/gntaccount.c:1 ../finch/gntcertmgr.c:1 ../finch/gntdebug.c:1 -#: ../finch/gntplugin.c:1 ../finch/gntpounce.c:1 ../finch/gntprefs.c:1 -#: ../finch/gntsound.c:1 ../finch/gntstatus.c:1 ../finch/gntstatus.c:1 +#: ../finch/gntaccount.c:1 ../finch/gntcertmgr.c:1 ../finch/gntdebug.c:1 +#: ../finch/gntplugin.c:1 ../finch/gntpounce.c:1 ../finch/gntprefs.c:1 +#: ../finch/gntsound.c:1 ../finch/gntstatus.c:1 ../finch/gntstatus.c:1 #: ../libpurple/account.c:1 ../libpurple/plugins/buddynote.c:1 #: ../libpurple/protocols/jabber/buddy.c:1 ../pidgin/gtkdebug.c:1 #: ../pidgin/gtkrequest.c:1 @@ -190,7 +190,7 @@ #. Delete button #: ../finch/gntaccount.c:1 ../finch/gntcertmgr.c:1 ../finch/gntpounce.c:1 -#: ../finch/gntpounce.c:1 ../finch/gntstatus.c:1 ../finch/gntstatus.c:1 +#: ../finch/gntpounce.c:1 ../finch/gntstatus.c:1 ../finch/gntstatus.c:1 #: ../pidgin/gtkaccount.c:1 ../pidgin/gtklog.c:1 ../pidgin/gtkpounce.c:1 #: ../pidgin/gtkrequest.c:1 ../pidgin/gtksavedstatuses.c:1 #: ../pidgin/gtkstatusbox.c:1 @@ -208,7 +208,7 @@ #. Add button #: ../finch/gntaccount.c:1 ../finch/gntblist.c:1 ../finch/gntblist.c:1 -#: ../finch/gntcertmgr.c:1 ../finch/gntnotify.c:1 ../finch/gntpounce.c:1 +#: ../finch/gntcertmgr.c:1 ../finch/gntnotify.c:1 ../finch/gntpounce.c:1 #: ../finch/gntstatus.c:1 ../libpurple/protocols/gg/gg.c:1 #: ../libpurple/protocols/qq/sys_msg.c:1 #: ../libpurple/protocols/sametime/sametime.c:1 @@ -704,7 +704,7 @@ msgid "Hostname" msgstr "Nazwa hosta" -#: ../finch/gntcertmgr.c:1 ../finch/gntnotify.c:1 ../pidgin/gtkconv.c:1 +#: ../finch/gntcertmgr.c:1 ../finch/gntnotify.c:1 ../pidgin/gtkconv.c:1 #: ../pidgin/gtkdebug.c:1 msgid "Info" msgstr "Informacja" @@ -4490,7 +4490,7 @@ msgid "CTCP PING reply" msgstr "Odpowiedź CTCP PING" -#: ../libpurple/protocols/irc/parse.c:1 ../libpurple/protocols/toc/toc.c:1 +#: ../libpurple/protocols/irc/parse.c:1 ../libpurple/protocols/toc/toc.c:1 #: ../libpurple/protocols/toc/toc.c:1 msgid "Disconnected." msgstr "Rozłączony." @@ -8149,7 +8149,7 @@ msgid "Web Aware" msgstr "Strona WWW" -#: ../libpurple/protocols/oscar/oscar.c:1 ../libpurple/protocols/qq/qq.c:1 +#: ../libpurple/protocols/oscar/oscar.c:1 ../libpurple/protocols/qq/qq.c:1 #: ../libpurple/protocols/qq/qq.c:1 ../libpurple/protocols/yahoo/yahoo.c:1 #: ../libpurple/status.c:1 ../pidgin/gtkdocklet.c:1 ../pidgin/gtkstatusbox.c:1 #, c-format @@ -12602,7 +12602,7 @@ msgid "Exposure" msgstr "Ekspozycja" -#: ../libpurple/proxy.c:1 ../libpurple/proxy.c:1 +#: ../libpurple/proxy.c:1 ../libpurple/proxy.c:1 #, c-format msgid "" "Unable to create socket:\n"