pidgin: 3e94f287: disapproval of revision '3d39da6c8014095...
datallah at pidgin.im
datallah at pidgin.im
Thu Jul 17 00:55:45 EDT 2008
-----------------------------------------------------------------
Revision: 3e94f2878acde962711bfd55e47936c9dbf0f0bc
Ancestor: 3d39da6c8014095cac3a0741bf6fc26219e7aff8
Author: datallah at pidgin.im
Date: 2008-07-17T04:49:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3e94f2878acde962711bfd55e47936c9dbf0f0bc
Modified files:
ChangeLog.win32 libpurple/Makefile.mingw
libpurple/connection.c libpurple/example/nullclient.c
libpurple/protocols/Makefile.mingw
libpurple/protocols/bonjour/bonjour_ft.c
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/caps.c
libpurple/protocols/jabber/caps.h
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
libpurple/protocols/jabber/pep.c
libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
libpurple/protocols/msn/user.c
libpurple/protocols/oscar/Makefile.mingw
libpurple/protocols/silc/Makefile.mingw
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/zephyr/ZSendPkt.c pidgin/gtkblist.h
pidgin/gtkcertmgr.c pidgin/gtkdocklet.c
pidgin/gtkstatusbox.c pidgin/minidialog.c
pidgin/plugins/win32/winprefs/gtkappbar.h
pidgin/win32/winpidgin.c po/Makefile.mingw po/pl.po
ChangeLog:
disapproval of revision '3d39da6c8014095cac3a0741bf6fc26219e7aff8'
-------------- next part --------------
============================================================
--- ChangeLog.win32 348828361087b94fc24e25ef78ba68454245a548
+++ ChangeLog.win32 a9ffdd41335f7faaf349db4b9bb216bfd06271df
@@ -1,5 +1,5 @@ version 2.4.3 (07/01/2008):
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
============================================================
--- libpurple/Makefile.mingw 8ba9e452daf413ced400b42f1da6b66bb50187f5
+++ libpurple/Makefile.mingw b2ff98bfc1a3f857f03e3b3c6f337ed251d07635
@@ -123,7 +123,7 @@ $(TARGET).dll $(TARGET).dll.a: $(OBJECTS
$(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
============================================================
--- libpurple/connection.c 681b4bc8e668baea8ad3763e5f42423b5aeb63b2
+++ libpurple/connection.c 99d100199ff71455d6a80af4dbfb7226e5ae2fb1
@@ -534,9 +534,6 @@ purple_connection_error_reason (PurpleCo
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();
============================================================
--- libpurple/example/nullclient.c cf31a682260e3b43f8955c6740db1c4d2c23dd54
+++ libpurple/example/nullclient.c 587f78d7b0f0c1d170ac1eac35d526ca62efa8f8
@@ -27,13 +27,8 @@
#include <signal.h>
#include <string.h>
-#ifndef _WIN32
#include <unistd.h>
-#else
-#include "win32/win32dep.h"
-#endif
-
#include "defines.h"
/**
@@ -85,11 +80,7 @@ static guint glib_input_add(gint fd, Pur
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 @@ int main(int argc, char *argv[])
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 @@ int main(int argc, char *argv[])
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. */
============================================================
--- libpurple/protocols/Makefile.mingw bea8d4f034c26c3ca46b4b4dc2678380e02177e1
+++ libpurple/protocols/Makefile.mingw 4024cb4925accddaff623f5bcff5e6793fcf89f2
@@ -8,7 +8,7 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
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
============================================================
--- libpurple/protocols/bonjour/bonjour_ft.c 8e1d6d186c47acd0e97dde10d8428d53a87f77fc
+++ libpurple/protocols/bonjour/bonjour_ft.c 439cfd8cee245794161314b1b15f672467c1d4dd
@@ -300,8 +300,6 @@ bonjour_free_xfer(PurpleXfer *xfer)
}
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 @@ bonjour_bytestreams_connect_cb(gpointer
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 @@ bonjour_bytestreams_connect_cb(gpointer
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 @@ bonjour_bytestreams_connect(PurpleXfer *
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;*/
}
}
============================================================
--- libpurple/protocols/jabber/Makefile.mingw cc90aab162c2c6096ff0c53e0fa097dfa9a25820
+++ libpurple/protocols/jabber/Makefile.mingw f0ba792560dee01a48fc6252c5fb4b1fd8e71689
@@ -125,7 +125,7 @@ $(TARGET).dll $(TARGET).dll.a: $(PURPLE_
$(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
============================================================
--- libpurple/protocols/jabber/caps.c 4366c692f1866aebb7c63b1b97d34e2a77466f68
+++ libpurple/protocols/jabber/caps.c ce2b1c9933e7c617f55ff2da3801ada27fcb0c36
@@ -113,11 +113,6 @@ void jabber_caps_init(void) {
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;
============================================================
--- libpurple/protocols/jabber/caps.h 27a2d542276da3052891d509816dca1d8a259ae1
+++ libpurple/protocols/jabber/caps.h 54e06b19e06eab75e72c513e76a90644b8433318
@@ -42,7 +42,6 @@ void jabber_caps_init(void);
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);
============================================================
--- libpurple/protocols/jabber/jabber.c 11959f4294c4a80870d8295ab996838b7fe7d2a6
+++ libpurple/protocols/jabber/jabber.c f005b3dede749de2f533f11c1c70a8575f2ef47a
@@ -61,7 +61,6 @@ GList *jabber_features = NULL;
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 @@ void jabber_idle_set(PurpleConnection *g
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 @@ gboolean jabber_offline_message(const Pu
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
============================================================
--- libpurple/protocols/jabber/jabber.h 20f09a9045b7f6f49c51cabc321a43ce9d34eb32
+++ libpurple/protocols/jabber/jabber.h 9ac68a50935a4f775fff15e205e9dc61dff2843c
@@ -242,7 +242,6 @@ char *jabber_parse_error(JabberStream *j
*/
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 @@ void jabber_register_commands(void);
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_ */
============================================================
--- libpurple/protocols/jabber/pep.c 8b34390725f8ba3e0b48e0708814c088867bad05
+++ libpurple/protocols/jabber/pep.c e23f33cb18be2ecd93000dc2c56fc51ec2efbee5
@@ -39,13 +39,6 @@ void jabber_pep_init(void) {
}
}
-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);
============================================================
--- libpurple/protocols/msn/msn.c b3b2ec9299ba4d8f68e970e2771cf168264b1342
+++ libpurple/protocols/msn/msn.c 1b8684900822bfc42582e8b6666e0d2dffd522b6
@@ -1343,7 +1343,6 @@ fake_userlist_add_buddy(MsnUserList *use
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));
}
============================================================
--- libpurple/protocols/msn/msn.h d1f58a8be82e8530dd4fd7f6c52b757cc9cc1ac5
+++ libpurple/protocols/msn/msn.h d1f76a8fa8a3bdcb99f5aeb19fa9643a73d84d35
@@ -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 */
============================================================
--- libpurple/protocols/msn/user.c 81de621eb57b5b26774d00ffbf460c47e9a3f463
+++ libpurple/protocols/msn/user.c 28cbd14450d2d51336f4da345504d59511d73c09
@@ -235,19 +235,21 @@ void
/*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 @@ msn_user_add_group_id(MsnUser *user, con
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);
============================================================
--- libpurple/protocols/oscar/Makefile.mingw e9e85f2115660443950807d9d780cb3df13c6865
+++ libpurple/protocols/oscar/Makefile.mingw a0bc11ebd0a5d791594f956f6188445fca274426
@@ -109,7 +109,7 @@ $(TARGET).dll.a $(TARGET).dll: $(PURPLE_
$(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
============================================================
--- libpurple/protocols/silc/Makefile.mingw b0b07ef50a7a2af7ad8e6579572dc03c005d4cd7
+++ libpurple/protocols/silc/Makefile.mingw 9f3db1d56cb2945f77d03eaf2c9659bafe4aac41
@@ -79,7 +79,7 @@ $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS
$(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
============================================================
--- libpurple/protocols/yahoo/yahoo.c c8aa161bbf301e85bcc3fbb5c5035f0fb9e6d05f
+++ libpurple/protocols/yahoo/yahoo.c 7615d64f5bd4a969347a5ed47f25249173786dc7
@@ -148,14 +148,6 @@ static void yahoo_process_status(PurpleC
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);
============================================================
--- libpurple/protocols/zephyr/ZSendPkt.c c1aeb01039aa891b5ff3bc8226d93df242b25cab
+++ libpurple/protocols/zephyr/ZSendPkt.c 3eda8eca082ea7cc64ff9575ed69de4a8f882760
@@ -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 ZSendPacket(packet, len, waitfora
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 @@ Code_t ZSendPacket(packet, len, waitfora
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)
============================================================
--- pidgin/gtkblist.h 465a0f57b02298a83ca337dcb3421b595928851e
+++ pidgin/gtkblist.h 1432074dfa3f5aab3563e5db7c1ee41e7e759fa9
@@ -194,14 +194,11 @@ void pidgin_blist_update_refresh_timeout
void pidgin_blist_update_refresh_timeout(void);
/**
- * Returns the blist emblem.
+ * Returns the blist emblem
*
- * This may be an existing pixbuf that has been given an additional ref,
- * so it shouldn't be modified.
- *
* @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);
============================================================
--- pidgin/gtkcertmgr.c e38d1bdfc51e66367d62ab95d7af2e2097c994c8
+++ pidgin/gtkcertmgr.c c061fa9493ea3cd74b977496a62d5c49e59d4d0f
@@ -57,7 +57,7 @@ typedef struct {
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 @@ tls_peers_mgmt_mod_cb(PurpleCertificateP
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 @@ tls_peers_mgmt_export_ok_cb(gpointer dat
{
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 @@ pidgin_certmgr_show(void)
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 @@ pidgin_certmgr_hide(void)
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);
============================================================
--- pidgin/gtkdocklet.c 245f62ce7e6b5b6ef7a4e434d7bf5763822687d9
+++ pidgin/gtkdocklet.c f42a159b6e3e0e8b80fed9d0d294e6586b467c85
@@ -95,10 +95,6 @@ get_pending_list(guint max)
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 @@ build_plugin_actions(GtkWidget *menu, Pu
}
-
static void
docklet_plugin_actions(GtkWidget *menu)
{
@@ -670,6 +665,7 @@ docklet_plugin_actions(GtkWidget *menu)
if(c>0)
pidgin_separator(menu);
}
+
static void
docklet_menu(void)
{
============================================================
--- pidgin/gtkstatusbox.c 5a502772dc333dd20f497c75d035969c473ba12c
+++ pidgin/gtkstatusbox.c 071b9dfc88b4feda284929e6df9e6a11c1a65544
@@ -203,8 +203,8 @@ update_to_reflect_account_status(PidginS
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, Gdk
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;
}
============================================================
--- pidgin/minidialog.c 9d0ba9acb0cbdf94540bd6a80e8a7479103a9d78
+++ pidgin/minidialog.c 479886cfeedaf417f97527f10aa589bb83e5a7d2
@@ -63,7 +63,7 @@ pidgin_mini_dialog_get_type (void)
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);
============================================================
--- pidgin/plugins/win32/winprefs/gtkappbar.h 01d531ca865c406312b6a6261154b8bf0fecd989
+++ pidgin/plugins/win32/winprefs/gtkappbar.h 0a577aea62faab1556160aefb23e7ab16643e43b
@@ -33,7 +33,7 @@ typedef struct {
/** 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? */
============================================================
--- pidgin/win32/winpidgin.c fafa8bb4d4b6295f37cd4b095d5c5716caf8f05a
+++ pidgin/win32/winpidgin.c 8627e53a18f8d22a5822d5e631879c5c173093c2
@@ -89,8 +89,9 @@ static BOOL read_reg_string(HKEY key, ch
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 @@ static void portable_mode_dll_prep(const
/* 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 @@ static char* winpidgin_lcid_to_posix(LCI
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 @@ static void winpidgin_set_locale() {
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) {
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 @@ WinMain (struct HINSTANCE__ *hInstance,
} 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 @@ WinMain (struct HINSTANCE__ *hInstance,
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;
============================================================
--- po/Makefile.mingw 7e1172f9e50fa5ac00008682052948b26198e5ad
+++ po/Makefile.mingw ca14fc6da7230c97f10cf37a15c2ae88497831b1
@@ -22,7 +22,7 @@ CATALOGS = $(patsubst %.po,%.gmo,$(wildc
##
.po.gmo:
- rm -f $@ && $(GMSGFMT) -c --statistics -o $@ $<
+ rm -f $@ && $(GMSGFMT) --statistics -o $@ $<
##
## TARGETS
============================================================
--- po/pl.po aba9ed0231e0201cf2fd00a97db5bfd65e502e53
+++ po/pl.po 64998c8da52a6811a76ca19cbf5e454aacf04f81
More information about the Commits
mailing list