* Rename names of variables, Group, to Room
* Functions of group_network merged into qq_network and qq_process
- * Canceled managing glist of group packet, add sub_cmdd and room_id to transaction
+ * Cancelled managing glist of group packet, add sub_cmdd and room_id to transaction
* Fixed error of demo group:
If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet.
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/buddy_info.c
--- a/libpurple/protocols/qq/buddy_info.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/buddy_info.c Mon Sep 13 09:57:03 2010 +0000
@@ -224,12 +224,10 @@
void qq_request_buddy_info(PurpleConnection *gc, guint32 uid,
guint32 update_class, int action)
{
- qq_data *qd;
gchar raw_data[16] = {0};
g_return_if_fail(uid != 0);
- qd = (qq_data *) gc->proto_data;
g_snprintf(raw_data, sizeof(raw_data), "%u", uid);
qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDY_INFO, (guint8 *) raw_data, strlen(raw_data),
update_class, action);
@@ -271,7 +269,6 @@
static void info_modify_ok_cb(modify_info_request *info_request, PurpleRequestFields *fields)
{
PurpleConnection *gc;
- qq_data *qd;
gchar **segments;
int index;
const char *utf8_str;
@@ -279,8 +276,7 @@
int choice_num;
gc = info_request->gc;
- g_return_if_fail(gc != NULL && info_request->gc);
- qd = (qq_data *) gc->proto_data;
+ g_return_if_fail(gc != NULL);
segments = info_request->segments;
g_return_if_fail(segments != NULL);
@@ -390,14 +386,12 @@
static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int iclass)
{
- qq_data *qd;
PurpleRequestFieldGroup *group;
PurpleRequestFields *fields;
modify_info_request *info_request;
gchar *utf8_title, *utf8_prim;
int index;
- qd = (qq_data *) gc->proto_data;
/* Keep one dialog once a time */
purple_request_close_with_handle(gc);
@@ -416,9 +410,11 @@
case QQ_FIELD_CONTACT:
utf8_title = g_strdup(_("Modify Contact"));
utf8_prim = g_strdup_printf("%s for %s", _("Modify Contact"), segments[0]);
+ break;
case QQ_FIELD_ADDR:
utf8_title = g_strdup(_("Modify Address"));
utf8_prim = g_strdup_printf("%s for %s", _("Modify Address"), segments[0]);
+ break;
case QQ_FIELD_EXT:
utf8_title = g_strdup(_("Modify Extended Information"));
utf8_prim = g_strdup_printf("%s for %s", _("Modify Extended Information"), segments[0]);
@@ -427,6 +423,7 @@
default:
utf8_title = g_strdup(_("Modify Information"));
utf8_prim = g_strdup_printf("%s for %s", _("Modify Information"), segments[0]);
+ break;
}
info_request = g_new0(modify_info_request, 1);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/buddy_list.c
--- a/libpurple/protocols/qq/buddy_list.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/buddy_list.c Mon Sep 13 09:57:03 2010 +0000
@@ -55,11 +55,9 @@
/* get a list of online_buddies */
void qq_request_get_buddies_online(PurpleConnection *gc, guint8 position, guint32 update_class)
{
- qq_data *qd;
guint8 *raw_data;
gint bytes = 0;
- qd = (qq_data *) gc->proto_data;
raw_data = g_newa(guint8, 5);
/* 000-000 get online friends cmd
@@ -360,7 +358,6 @@
guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConnection *gc)
{
- qq_data *qd;
gint i, j;
gint bytes;
guint8 sub_cmd, reply_code;
@@ -371,8 +368,6 @@
g_return_val_if_fail(data != NULL && data_len != 0, -1);
- qd = (qq_data *) gc->proto_data;
-
bytes = 0;
bytes += qq_get8(&sub_cmd, data + bytes);
g_return_val_if_fail(sub_cmd == 0x01, -1);
@@ -468,11 +463,6 @@
guint8 away_cmd;
guint32 misc_status;
gboolean fake_video;
- PurpleAccount *account;
- PurplePresence *presence;
-
- account = purple_connection_get_account(gc);
- presence = purple_account_get_presence(account);
qd = (qq_data *) gc->proto_data;
if (!qd->is_login)
@@ -596,14 +586,13 @@
void qq_update_buddy_status(PurpleConnection *gc, guint32 uid, guint8 status, guint8 flag)
{
gchar *who;
- gchar *status_id;
+ const gchar *status_id;
g_return_if_fail(uid != 0);
/* purple supports signon and idle time
* but it is not much use for QQ, I do not use them */
/* serv_got_update(gc, name, online, 0, q_bud->signon, q_bud->idle, bud->uc); */
- status_id = "available";
switch(status) {
case QQ_BUDDY_OFFLINE:
status_id = "offline";
@@ -677,13 +666,10 @@
void qq_buddy_data_free_all(PurpleConnection *gc)
{
- qq_data *qd;
PurpleBuddy *buddy;
GSList *buddies, *it;
gint count = 0;
- qd = (qq_data *)purple_connection_get_protocol_data(gc);
-
buddies = purple_find_buddies(purple_connection_get_account(gc), NULL);
for (it = buddies; it; it = it->next) {
qq_buddy_data *qbd = NULL;
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/buddy_opt.c
--- a/libpurple/protocols/qq/buddy_opt.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/buddy_opt.c Mon Sep 13 09:57:03 2010 +0000
@@ -262,7 +262,6 @@
void qq_process_auth_code(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
{
- qq_data *qd;
gint bytes;
guint8 cmd, reply;
guint16 sub_cmd;
@@ -272,8 +271,6 @@
g_return_if_fail(data != NULL && data_len != 0);
g_return_if_fail(uid != 0);
- qd = (qq_data *) gc->proto_data;
-
qq_show_packet("qq_process_auth_code", data, data_len);
bytes = 0;
bytes += qq_get8(&cmd, data + bytes);
@@ -324,7 +321,7 @@
add_req->auth_len = 0;
who = uid_to_purple_name(uid);
- msg = g_strdup_printf(_("%u requires verification"), uid);
+ msg = g_strdup_printf(_("%u requires verification: %s"), uid, question);
purple_request_input(gc, _("Add buddy question"), msg,
_("Enter answer here"),
NULL,
@@ -400,7 +397,6 @@
void qq_process_question(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
{
- qq_data *qd;
gint bytes;
guint8 cmd, reply;
gchar *question, *answer;
@@ -409,8 +405,6 @@
g_return_if_fail(data != NULL && data_len != 0);
- qd = (qq_data *) gc->proto_data;
-
qq_show_packet("qq_process_question", data, data_len);
bytes = 0;
bytes += qq_get8(&cmd, data + bytes);
@@ -720,13 +714,10 @@
/* process reply to add_buddy_auth request */
void qq_process_add_buddy_auth(guint8 *data, gint data_len, PurpleConnection *gc)
{
- qq_data *qd;
gchar **segments, *msg_utf8;
g_return_if_fail(data != NULL && data_len != 0);
- qd = (qq_data *) gc->proto_data;
-
if (data[0] == '0') {
purple_debug_info("QQ", "Reply OK for sending authorize\n");
return;
@@ -767,11 +758,9 @@
/* process the server reply for my request to remove myself from a buddy */
void qq_process_buddy_remove_me(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
{
- qq_data *qd;
gchar *msg;
g_return_if_fail(data != NULL && data_len != 0);
- qd = (qq_data *) gc->proto_data;
if (data[0] == 0) {
purple_debug_info("QQ", "Reply OK for removing me from %u's buddy list\n", uid);
@@ -1004,7 +993,6 @@
void qq_process_buddy_check_code(PurpleConnection *gc, guint8 *data, gint data_len)
{
- qq_data *qd;
gint bytes;
guint8 cmd;
guint8 reply;
@@ -1013,8 +1001,6 @@
g_return_if_fail(data != NULL && data_len >= 5);
- qd = (qq_data *) gc->proto_data;
-
qq_show_packet("buddy_check_code", data, data_len);
bytes = 0;
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/file_trans.c
--- a/libpurple/protocols/qq/file_trans.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/file_trans.c Mon Sep 13 09:57:03 2010 +0000
@@ -238,12 +238,9 @@
gint bytes = 0;
guint32 file_key;
qq_data *qd;
- ft_info *info;
qd = (qq_data *) gc->proto_data;
- info = (ft_info *) qd->xfer->data;
-
raw_data = g_newa(guint8, MAX_PACKET_SIZE);
file_key = _gen_file_key();
@@ -805,9 +802,6 @@
{
gint bytes;
guint8 tag;
- qq_data *qd;
-
- qd = (qq_data *) gc->proto_data;
bytes = 0;
bytes += qq_get8(&tag, data + bytes);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/group.c
--- a/libpurple/protocols/qq/group.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/group.c Mon Sep 13 09:57:03 2010 +0000
@@ -119,13 +119,11 @@
/* free roomlist space, I have no idea when this one is called... */
void qq_roomlist_cancel(PurpleRoomlist *list)
{
- qq_data *qd;
PurpleConnection *gc;
g_return_if_fail(list != NULL);
gc = purple_account_get_connection(list->account);
- qd = (qq_data *) gc->proto_data;
purple_roomlist_set_in_progress(list, FALSE);
purple_roomlist_unref(list);
}
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/group_im.c
--- a/libpurple/protocols/qq/group_im.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/group_im.c Mon Sep 13 09:57:03 2010 +0000
@@ -48,12 +48,10 @@
PurpleConversation *qq_room_conv_open(PurpleConnection *gc, qq_room_data *rmd)
{
PurpleConversation *conv;
- qq_data *qd;
gchar *topic_utf8;
g_return_val_if_fail(rmd != NULL, NULL);
g_return_val_if_fail(rmd->title_utf8, NULL);
- qd = (qq_data *) gc->proto_data;
conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
rmd->title_utf8, purple_connection_get_account(gc));
@@ -207,7 +205,6 @@
/* recv an IM from a group chat */
void qq_process_room_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 msg_type)
{
- qq_data *qd;
gchar *msg_smiley, *msg_fmt, *msg_utf8;
gint bytes, tail_len;
struct {
@@ -229,7 +226,6 @@
/* at least include im_text.msg_len */
g_return_if_fail(data != NULL && data_len > 23);
- qd = (qq_data *) gc->proto_data;
/* qq_show_packet("ROOM_IM", data, data_len); */
memset(&im_text, 0, sizeof(im_text));
@@ -376,7 +372,6 @@
gint msg_len;
const gchar *start_invalid;
gboolean is_smiley_none;
- guint8 frag_count, frag_index;
g_return_val_if_fail(NULL != gc && NULL != gc->proto_data, -1);
g_return_val_if_fail(id != 0 && what != NULL, -1);
@@ -386,9 +381,6 @@
/* qq_show_packet("chat IM UTF8", (guint8 *)what, strlen(what)); */
- fmt = qq_im_fmt_new_by_purple(what);
- is_smiley_none = qq_im_smiley_none(what);
-
msg_stripped = purple_markup_strip_html(what);
g_return_val_if_fail(msg_stripped != NULL, -1);
/* qq_show_packet("IM Stripped", (guint8 *)what, strlen(what)); */
@@ -417,26 +409,10 @@
qd->send_im_id++;
fmt = qq_im_fmt_new_by_purple(what);
- frag_count = g_slist_length(segments);
- frag_index = 0;
-/*
- if (frag_count <= 1) {
-*/
- for (it = segments; it; it = it->next) {
- request_room_send_im(gc, id, fmt, (gchar *)it->data);
- g_free(it->data);
- }
-/*
- } else {
- for (it = segments; it; it = it->next) {
- request_room_send_im_ex(gc, id, fmt, (gchar *)it->data,
- qd->send_im_id, frag_count, frag_index);
- g_free(it->data);
- frag_index++;
- }
+ for (it = segments; it; it = g_slist_delete_link(it, it)) {
+ request_room_send_im(gc, id, fmt, (gchar *)it->data);
+ g_free(it->data);
}
-*/
qq_im_fmt_free(fmt);
- g_slist_free(segments);
return 1;
}
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/group_join.c
--- a/libpurple/protocols/qq/group_join.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/group_join.c Mon Sep 13 09:57:03 2010 +0000
@@ -178,12 +178,10 @@
/* If comes here, cmd is OK already */
void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *gc)
{
- qq_data *qd;
gint bytes;
guint32 id;
g_return_if_fail(data != NULL && len > 0);
- qd = (qq_data *) gc->proto_data;
if (len < 4) {
purple_debug_error("QQ", "Invalid exit group reply, expect %d bytes, read %d bytes\n", 4, len);
@@ -201,12 +199,10 @@
{
gint bytes;
guint32 id;
- qq_data *qd;
qq_room_data *rmd;
gchar *msg;
g_return_if_fail(data != NULL && len > 0);
- qd = (qq_data *) gc->proto_data;
if (len < 4) {
purple_debug_error("QQ",
@@ -283,7 +279,6 @@
/* Attempt to join a group without auth */
void qq_group_join(PurpleConnection *gc, GHashTable *data)
{
- qq_data *qd;
gchar *ext_id_str;
gchar *id_str;
guint32 ext_id;
@@ -291,7 +286,6 @@
qq_room_data *rmd;
g_return_if_fail(data != NULL);
- qd = (qq_data *) gc->proto_data;
ext_id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_EXTERNAL_ID);
id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_INTERNAL_ID);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/group_opt.c
--- a/libpurple/protocols/qq/group_opt.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/group_opt.c Mon Sep 13 09:57:03 2010 +0000
@@ -134,12 +134,10 @@
{
guint32 *old_members, *del_members, *add_members;
qq_buddy_data *bd;
- qq_data *qd;
gint i = 0, old = 0, new = 0, del = 0, add = 0;
GList *list;
g_return_if_fail(rmd != NULL);
- qd = (qq_data *) gc->proto_data;
if (new_members[0] == 0xffffffff)
return;
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/im.c
--- a/libpurple/protocols/qq/im.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/im.c Mon Sep 13 09:57:03 2010 +0000
@@ -725,7 +725,6 @@
/* process received normal text IM */
static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header)
{
- qq_data *qd;
guint16 purple_msg_type;
gchar *who;
gchar *msg_smiley, *msg_fmt, *msg_utf8;
@@ -749,10 +748,9 @@
gchar *msg; /* no fixed length, ends with 0x00 */
} im_text;
- g_return_if_fail (data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
g_return_if_fail(im_header != NULL);
- qd = (qq_data *) gc->proto_data;
memset(&im_text, 0, sizeof(im_text));
/* qq_show_packet("IM text", data, len); */
@@ -823,7 +821,6 @@
/* process received extended (2007) text IM */
static void process_extend_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header)
{
- qq_data *qd;
guint16 purple_msg_type;
gchar *who;
gchar *msg_smiley, *msg_fmt, *msg_utf8;
@@ -848,10 +845,9 @@
guint8 fromMobileQQ;
} im_text;
- g_return_if_fail (data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
g_return_if_fail(im_header != NULL);
- qd = (qq_data *) gc->proto_data;
memset(&im_text, 0, sizeof(im_text));
/* qq_show_packet("Extend IM text", data, len); */
@@ -1043,12 +1039,10 @@
{
qq_data *qd;
guint8 raw_data[MAX_PACKET_SIZE - 16];
- guint16 im_type;
gint bytes;
time_t now;
qd = (qq_data *) gc->proto_data;
- im_type = QQ_NORMAL_IM_TEXT;
/* purple_debug_info("QQ", "Send IM %d-%d\n", frag_count, frag_index); */
bytes = 0;
@@ -1118,13 +1112,12 @@
GString *new_string;
GString *append_utf8;
gchar *start, *p;
- gint count, len;
+ gint len;
qq_emoticon *emoticon;
g_return_val_if_fail(msg_stripped != NULL, NULL);
start = msg_stripped;
- count = 0;
new_string = g_string_new("");
append_utf8 = g_string_new("");
while (*start) {
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/qq.c
--- a/libpurple/protocols/qq/qq.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/qq.c Mon Sep 13 09:57:03 2010 +0000
@@ -89,15 +89,12 @@
{
PurpleConnection *gc;
qq_data *qd;
- PurpleProxyInfo *gpi;
const gchar *custom_server;
gc = purple_account_get_connection(account);
g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = gc->proto_data;
- gpi = purple_proxy_get_setup(account);
-
qd->use_tcp = purple_account_get_bool(account, "use_tcp", TRUE);
custom_server = purple_account_get_string(account, "server", NULL);
@@ -381,11 +378,10 @@
static const char *qq_list_emblem(PurpleBuddy *b)
{
PurpleAccount *account;
- PurpleConnection *gc;
qq_buddy_data *buddy;
if (!b || !(account = purple_buddy_get_account(b)) ||
- !(gc = purple_account_get_connection(account)))
+ !purple_account_get_connection(account))
return NULL;
buddy = purple_buddy_get_protocol_data(b);
@@ -618,12 +614,10 @@
static void action_about_openq(PurplePluginAction *action)
{
PurpleConnection *gc = (PurpleConnection *) action->context;
- qq_data *qd;
GString *info;
gchar *title;
- g_return_if_fail(NULL != gc && NULL != gc->proto_data);
- qd = (qq_data *) gc->proto_data;
+ g_return_if_fail(NULL != gc);
info = g_string_new("");
g_string_append(info, _("Original Author:
\n"));
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/qq_base.c
--- a/libpurple/protocols/qq/qq_base.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/qq_base.c Mon Sep 13 09:57:03 2010 +0000
@@ -386,7 +386,6 @@
/* process the login reply packet */
guint8 qq_process_login( PurpleConnection *gc, guint8 *data, gint data_len)
{
- qq_data *qd;
guint8 ret = data[0];
gchar *msg, *msg_utf8;
gchar *error;
@@ -394,8 +393,6 @@
g_return_val_if_fail(data != NULL && data_len != 0, QQ_LOGIN_REPLY_ERR);
- qd = (qq_data *) gc->proto_data;
-
switch (ret) {
case QQ_LOGIN_REPLY_OK:
purple_debug_info("QQ", "Login OK\n");
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/qq_network.c
--- a/libpurple/protocols/qq/qq_network.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/qq_network.c Mon Sep 13 09:57:03 2010 +0000
@@ -482,13 +482,11 @@
static void udp_pending(gpointer data, gint source, PurpleInputCondition cond)
{
PurpleConnection *gc = NULL;
- qq_data *qd;
guint8 *buf;
gint buf_len;
gc = (PurpleConnection *) data;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
- qd = (qq_data *) gc->proto_data;
+ g_return_if_fail(gc != NULL);
if(cond != PURPLE_INPUT_READ) {
purple_connection_error_reason(gc,
@@ -748,14 +746,12 @@
{
PurpleConnection *gc;
qq_data *qd;
- PurpleAccount *account ;
qq_connection *conn;
gc = (PurpleConnection *) data;
g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
- account = purple_connection_get_account(gc);
/* conn_data will be destoryed */
qd->conn_data = NULL;
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/qq_process.c
--- a/libpurple/protocols/qq/qq_process.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/qq_process.c Mon Sep 13 09:57:03 2010 +0000
@@ -58,15 +58,12 @@
/* default process, decrypt and dump */
static void process_unknow_cmd(PurpleConnection *gc,const gchar *title, guint8 *data, gint data_len, guint16 cmd, guint16 seq)
{
- qq_data *qd;
gchar *msg;
g_return_if_fail(data != NULL && data_len != 0);
qq_show_packet(title, data, data_len);
- qd = (qq_data *) gc->proto_data;
-
qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ",
data, data_len,
">>> [%d] %s -> [default] decrypt and dump",
@@ -80,12 +77,8 @@
/* parse the reply to send_im */
static void do_im_ack(guint8 *data, gint data_len, PurpleConnection *gc)
{
- qq_data *qd;
-
g_return_if_fail(data != NULL && data_len != 0);
- qd = gc->proto_data;
-
if (data[0] != 0) {
purple_debug_warning("QQ", "Failed sent IM\n");
purple_notify_error(gc, _("Error"), _("Unable to send message."), NULL);
@@ -380,14 +373,11 @@
/* Send ACK if the sys message needs an ACK */
static void request_server_ack(PurpleConnection *gc, gchar *funct_str, gchar *from, guint16 seq)
{
- qq_data *qd;
guint8 *raw_data;
gint bytes;
guint8 bar;
g_return_if_fail(funct_str != NULL && from != NULL);
- qd = (qq_data *) gc->proto_data;
-
bar = 0x1e;
raw_data = g_newa(guint8, strlen(funct_str) + strlen(from) + 16);
@@ -568,11 +558,9 @@
void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
{
- qq_data *qd;
gint ret;
- g_return_if_fail (gc != NULL && gc->proto_data != NULL);
- qd = (qq_data *) gc->proto_data;
+ g_return_if_fail (gc != NULL);
switch (room_cmd) {
case 0:
@@ -599,12 +587,10 @@
void qq_update_all_rooms(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
{
- qq_data *qd;
gboolean is_new_turn = FALSE;
guint32 next_id;
- g_return_if_fail (gc != NULL && gc->proto_data != NULL);
- qd = (qq_data *) gc->proto_data;
+ g_return_if_fail(gc != NULL);
next_id = qq_room_get_next(gc, room_id);
purple_debug_info("QQ", "Update rooms, next id %u, prev id %u\n", next_id, room_id);
@@ -689,11 +675,9 @@
static void update_all_rooms_online(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
{
- qq_data *qd;
guint32 next_id;
- g_return_if_fail (gc != NULL && gc->proto_data != NULL);
- qd = (qq_data *) gc->proto_data;
+ g_return_if_fail (gc != NULL);
next_id = qq_room_get_next_conv(gc, room_id);
if (next_id <= 0 && room_id <= 0) {
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/qq_trans.c
--- a/libpurple/protocols/qq/qq_trans.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/qq_trans.c Mon Sep 13 09:57:03 2010 +0000
@@ -109,11 +109,9 @@
static qq_transaction *trans_create(PurpleConnection *gc, gint fd,
guint16 cmd, guint16 seq, guint8 *data, gint data_len, guint32 update_class, guint32 ship32)
{
- qq_data *qd;
qq_transaction *trans;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
- qd = (qq_data *) gc->proto_data;
+ g_return_val_if_fail(gc != NULL, NULL);
trans = g_new0(qq_transaction, 1);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/qq/send_file.c
--- a/libpurple/protocols/qq/send_file.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/qq/send_file.c Mon Sep 13 09:57:03 2010 +0000
@@ -637,10 +637,8 @@
{
PurpleConnection *gc;
PurpleAccount *account;
- guint16 *seq;
g_return_if_fail (xfer != NULL);
- seq = (guint16 *) xfer->data;
account = purple_xfer_get_account(xfer);
gc = purple_account_get_connection(account);
@@ -670,10 +668,8 @@
{
PurpleConnection *gc;
PurpleAccount *account;
- ft_info *info;
- g_return_if_fail (xfer != NULL && xfer->data != NULL);
- info = (ft_info *) xfer->data;
+ g_return_if_fail(xfer != NULL);
account = purple_xfer_get_account(xfer);
gc = purple_account_get_connection(account);
@@ -752,7 +748,7 @@
g_return_if_fail (data != NULL && data_len != 0);
qd = (qq_data *) gc->proto_data;
xfer = qd->xfer;
- info = (ft_info *) qd->xfer->data;
+ info = (ft_info *) xfer->data;
if (data_len <= 30 + QQ_CONN_INFO_LEN) {
purple_debug_warning("QQ", "Received file reject message is empty\n");
@@ -761,7 +757,7 @@
bytes = 18 + 12; /* skip 30 bytes */
qq_get_conn_info(info, data + bytes);
- _qq_xfer_init_socket(qd->xfer);
+ _qq_xfer_init_socket(xfer);
_qq_xfer_init_udp_channel(info);
_qq_send_packet_file_notifyip(gc, sender_uid);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/sametime/sametime.c Mon Sep 13 09:57:03 2010 +0000
@@ -2133,7 +2133,7 @@
static void ft_incoming_cancel(PurpleXfer *xfer) {
- /* incoming transfer rejected or canceled in-progress */
+ /* incoming transfer rejected or cancelled in-progress */
struct mwFileTransfer *ft = xfer->data;
if(ft) mwFileTransfer_reject(ft);
}
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/silc/chat.c
--- a/libpurple/protocols/silc/chat.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/silc/chat.c Mon Sep 13 09:57:03 2010 +0000
@@ -1395,7 +1395,7 @@
if (sg->roomlist)
purple_roomlist_unref(sg->roomlist);
- sg->roomlist_canceled = FALSE;
+ sg->roomlist_cancelled = FALSE;
sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1429,6 +1429,6 @@
if (sg->roomlist == list) {
purple_roomlist_unref(sg->roomlist);
sg->roomlist = NULL;
- sg->roomlist_canceled = TRUE;
+ sg->roomlist_cancelled = TRUE;
}
}
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/silc/ops.c
--- a/libpurple/protocols/silc/ops.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/silc/ops.c Mon Sep 13 09:57:03 2010 +0000
@@ -1455,7 +1455,7 @@
int usercount;
PurpleRoomlistRoom *room;
- if (sg->roomlist_canceled)
+ if (sg->roomlist_cancelled)
break;
if (error != SILC_STATUS_OK) {
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/silc/silcpurple.h
--- a/libpurple/protocols/silc/silcpurple.h Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/silc/silcpurple.h Mon Sep 13 09:57:03 2010 +0000
@@ -85,7 +85,7 @@
SilcMimeAssembler mimeass;
unsigned int detaching : 1;
unsigned int resuming : 1;
- unsigned int roomlist_canceled : 1;
+ unsigned int roomlist_cancelled : 1;
unsigned int chpk : 1;
} *SilcPurple;
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/silc10/chat.c
--- a/libpurple/protocols/silc10/chat.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/silc10/chat.c Mon Sep 13 09:57:03 2010 +0000
@@ -1417,7 +1417,7 @@
if (sg->roomlist)
purple_roomlist_unref(sg->roomlist);
- sg->roomlist_canceled = FALSE;
+ sg->roomlist_cancelled = FALSE;
sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1451,6 +1451,6 @@
if (sg->roomlist == list) {
purple_roomlist_unref(sg->roomlist);
sg->roomlist = NULL;
- sg->roomlist_canceled = TRUE;
+ sg->roomlist_cancelled = TRUE;
}
}
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/silc10/ops.c
--- a/libpurple/protocols/silc10/ops.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/silc10/ops.c Mon Sep 13 09:57:03 2010 +0000
@@ -1444,7 +1444,7 @@
int usercount;
PurpleRoomlistRoom *room;
- if (sg->roomlist_canceled)
+ if (sg->roomlist_cancelled)
break;
if (!success) {
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/silc10/silcpurple.h
--- a/libpurple/protocols/silc10/silcpurple.h Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/silc10/silcpurple.h Mon Sep 13 09:57:03 2010 +0000
@@ -80,7 +80,7 @@
#endif
unsigned int detaching : 1;
unsigned int resuming : 1;
- unsigned int roomlist_canceled : 1;
+ unsigned int roomlist_cancelled : 1;
unsigned int chpk : 1;
} *SilcPurple;
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c Mon Sep 13 09:57:03 2010 +0000
@@ -3906,7 +3906,6 @@
PurpleBuddy *buddy;
PurpleConnection *gc;
- YahooData *yd;
const char *game;
char *game2;
char *t;
@@ -3917,7 +3916,6 @@
buddy = (PurpleBuddy *) node;
gc = purple_account_get_connection(purple_buddy_get_account(buddy));
- yd = (YahooData *) gc->proto_data;
f = yahoo_friend_find(gc, purple_buddy_get_name(buddy));
if (!f)
@@ -4941,7 +4939,6 @@
struct yahoo_packet *pkt;
const char *group = NULL;
char *group2;
- YahooFriend *f;
const char *bname;
const char *fed_bname;
YahooFederation fed = YAHOO_FEDERATION_NONE;
@@ -4953,7 +4950,6 @@
if (!purple_privacy_check(purple_connection_get_account(gc), bname))
return;
- f = yahoo_friend_find(gc, bname);
fed = yahoo_get_federation_from_name(bname);
if (fed != YAHOO_FEDERATION_NONE)
fed_bname += 4;
@@ -5216,15 +5212,11 @@
{
GHashTable *comp;
PurpleConnection *gc;
- YahooData *yd;
- int id;
if (!args || !args[0])
return PURPLE_CMD_RET_FAILED;
gc = purple_conversation_get_gc(conv);
- yd = gc->proto_data;
- id = yd->conf_id;
purple_debug_info("yahoo", "Trying to join %s \n", args[0]);
comp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/yahoo/util.c Mon Sep 13 09:57:03 2010 +0000
@@ -43,7 +43,7 @@
if(proxy_ssl)
ppi = purple_proxy_get_setup(account);
else
- ppi = purple_global_proxy_get_info();
+ ppi = purple_proxy_get_setup(NULL);
type = purple_proxy_info_get_type(ppi);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/yahoo/yahoo_aliases.c
--- a/libpurple/protocols/yahoo/yahoo_aliases.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c Mon Sep 13 09:57:03 2010 +0000
@@ -145,7 +145,7 @@
if (alias != NULL) {
serv_got_alias(gc, yid, alias);
purple_debug_info("yahoo", "Fetched alias '%s' (%s)\n", alias, id);
- } else if (buddy_alias != NULL && strcmp(buddy_alias, "") != 0) {
+ } else if (buddy_alias && *buddy_alias && !g_str_equal(buddy_alias, yid)) {
/* Or if we have an alias that Yahoo doesn't, send it up */
yahoo_update_alias(gc, yid, buddy_alias);
purple_debug_info("yahoo", "Sent updated alias '%s'\n", buddy_alias);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/yahoo/yahoo_doodle.c
--- a/libpurple/protocols/yahoo/yahoo_doodle.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c Mon Sep 13 09:57:03 2010 +0000
@@ -372,7 +372,7 @@
/* TODO Ask if user wants to save picture before the session is closed */
- wb->state = DOODLE_STATE_CANCELED;
+ wb->state = DOODLE_STATE_CANCELLED;
purple_whiteboard_destroy(wb);
}
@@ -460,7 +460,7 @@
/* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */
- if (gc && wb->state != DOODLE_STATE_CANCELED)
+ if (gc && wb->state != DOODLE_STATE_CANCELLED)
yahoo_doodle_command_send_shutdown(gc, wb->who);
g_free(ds->imv_key);
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/yahoo/yahoo_doodle.h
--- a/libpurple/protocols/yahoo/yahoo_doodle.h Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/yahoo/yahoo_doodle.h Mon Sep 13 09:57:03 2010 +0000
@@ -56,7 +56,7 @@
#define DOODLE_STATE_REQUESTING 0
#define DOODLE_STATE_REQUESTED 1
#define DOODLE_STATE_ESTABLISHED 2
-#define DOODLE_STATE_CANCELED 3
+#define DOODLE_STATE_CANCELLED 3
/* Doodle canvas dimensions */
#define DOODLE_CANVAS_WIDTH 368
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/yahoo/yahoo_filexfer.c
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Mon Sep 13 09:57:03 2010 +0000
@@ -1235,14 +1235,14 @@
PurpleXfer *xfer;
struct yahoo_xfer_data *xd;
PurpleAccount *account;
- YahooData* yd;
+ PurpleConnection *gc;
if (!(xfer = data))
return;
if (!(xd = xfer->data))
return;
- yd = xd->gc->proto_data;
- account = purple_connection_get_account(xd->gc);
+ gc = xd->gc;
+ account = purple_connection_get_account(gc);
if ((source < 0) || (xd->path == NULL) || (xd->host == NULL)) {
purple_xfer_error(PURPLE_XFER_RECEIVE, purple_xfer_get_account(xfer),
xfer->who, _("Unable to connect."));
@@ -1253,7 +1253,14 @@
if (xd->txbuflen == 0)
{
gchar* cookies;
- cookies = yahoo_get_cookies(xd->gc);
+ YahooData *yd = gc->proto_data;
+
+ /* cookies = yahoo_get_cookies(gc);
+ * This doesn't seem to be working. The function is returning NULL, which yahoo servers don't like
+ * For now let us not use this function */
+
+ cookies = g_strdup_printf("Y=%s; T=%s", yd->cookie_y, yd->cookie_t);
+
if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == ACCEPTED)
{
if(xd->info_val_249 == 2)
diff -r 581a070c3737 -r 66981e71af29 libpurple/protocols/yahoo/yahoochat.c
--- a/libpurple/protocols/yahoo/yahoochat.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/protocols/yahoo/yahoochat.c Mon Sep 13 09:57:03 2010 +0000
@@ -617,9 +617,6 @@
char *who = NULL;
char *room = NULL;
GSList *l;
- YahooData *yd;
-
- yd = gc->proto_data;
for (l = pkt->hash; l; l = l->next) {
struct yahoo_pair *pair = l->data;
@@ -638,8 +635,7 @@
purple_conv_chat_remove_user(PURPLE_CONV_CHAT(c), who, NULL);
}
- if (room)
- g_free(room);
+ g_free(room);
}
void yahoo_process_chat_message(PurpleConnection *gc, struct yahoo_packet *pkt)
diff -r 581a070c3737 -r 66981e71af29 libpurple/request.c
--- a/libpurple/request.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/request.c Mon Sep 13 09:57:03 2010 +0000
@@ -1399,6 +1399,11 @@
handles = g_list_append(handles, info);
return info->ui_handle;
+ } else {
+ /* Fall back on the non-icon request if the UI doesn't support icon
+ requests */
+ return purple_request_action_varg(handle, title, primary, secondary,
+ default_action, account, who, conv, user_data, action_count, actions);
}
return NULL;
diff -r 581a070c3737 -r 66981e71af29 libpurple/stun.c
--- a/libpurple/stun.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/stun.c Mon Sep 13 09:57:03 2010 +0000
@@ -105,11 +105,11 @@
}
static void do_callbacks(void) {
- while(callbacks) {
+ while (callbacks) {
StunCallback cb = callbacks->data;
- if(cb)
+ if (cb)
cb(&nattype);
- callbacks = g_slist_remove(callbacks, cb);
+ callbacks = g_slist_delete_link(callbacks, callbacks);
}
}
@@ -280,7 +280,6 @@
GSList *hosts = data;
struct stun_conn *sc;
static struct stun_header hdr_data;
- int ret;
if(fd < 0) {
nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
@@ -298,15 +297,14 @@
sc->incb = purple_input_add(fd, PURPLE_INPUT_READ, reply_cb, sc);
- ret = GPOINTER_TO_INT(hosts->data);
- hosts = g_slist_remove(hosts, hosts->data);
+ hosts = g_slist_delete_link(hosts, hosts);
memcpy(&(sc->addr), hosts->data, sizeof(struct sockaddr_in));
g_free(hosts->data);
- hosts = g_slist_remove(hosts, hosts->data);
- while(hosts) {
- hosts = g_slist_remove(hosts, hosts->data);
+ hosts = g_slist_delete_link(hosts, hosts);
+ while (hosts) {
+ hosts = g_slist_delete_link(hosts, hosts);
g_free(hosts->data);
- hosts = g_slist_remove(hosts, hosts->data);
+ hosts = g_slist_delete_link(hosts, hosts);
}
hdr_data.type = htons(MSGTYPE_BINDINGREQUEST);
@@ -341,10 +339,10 @@
}
if (!purple_network_listen_range(12108, 12208, SOCK_DGRAM, hbn_listen_cb, hosts)) {
- while(hosts) {
- hosts = g_slist_remove(hosts, hosts->data);
+ while (hosts) {
+ hosts = g_slist_delete_link(hosts, hosts);
g_free(hosts->data);
- hosts = g_slist_remove(hosts, hosts->data);
+ hosts = g_slist_delete_link(hosts, hosts);
}
nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
diff -r 581a070c3737 -r 66981e71af29 libpurple/util.c
--- a/libpurple/util.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/util.c Mon Sep 13 09:57:03 2010 +0000
@@ -3115,7 +3115,7 @@
if (text[i] != thechar)
text[j++] = text[i];
- text[j++] = '\0';
+ text[j] = '\0';
}
void
diff -r 581a070c3737 -r 66981e71af29 libpurple/win32/global.mak
--- a/libpurple/win32/global.mak Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/win32/global.mak Mon Sep 13 09:57:03 2010 +0000
@@ -37,7 +37,6 @@
PURPLE_PLUGINS_TOP := $(PURPLE_TOP)/plugins
PURPLE_PERL_TOP := $(PURPLE_PLUGINS_TOP)/perl
PIDGIN_TOP := $(PIDGIN_TREE_TOP)/pidgin
-PIDGIN_IDLETRACK_TOP := $(PIDGIN_TOP)/win32/IdleTracker
PIDGIN_PIXMAPS_TOP := $(PIDGIN_TOP)/pixmaps
PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plugins
PURPLE_PO_TOP := $(PIDGIN_TREE_TOP)/po
@@ -48,7 +47,6 @@
PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
PIDGIN_REVISION_H := $(PIDGIN_TREE_TOP)/package_revision.h
PIDGIN_REVISION_RAW_TXT := $(PIDGIN_TREE_TOP)/package_revision_raw.txt
-PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll
PURPLE_PURPLE_H := $(PURPLE_TOP)/purple.h
PURPLE_VERSION_H := $(PURPLE_TOP)/version.h
PURPLE_DLL := $(PURPLE_TOP)/libpurple.dll
diff -r 581a070c3737 -r 66981e71af29 libpurple/win32/targets.mak
--- a/libpurple/win32/targets.mak Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/win32/targets.mak Mon Sep 13 09:57:03 2010 +0000
@@ -36,9 +36,6 @@
$(PIDGIN_DLL) $(PIDGIN_DLL).a:
$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll
-$(PIDGIN_IDLETRACK_DLL) $(PIDGIN_IDLETRACK_DLL).a:
- $(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) idletrack.dll
-
$(PIDGIN_EXE):
$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe
diff -r 581a070c3737 -r 66981e71af29 libpurple/win32/win32dep.c
--- a/libpurple/win32/win32dep.c Fri Aug 20 08:35:27 2010 +0000
+++ b/libpurple/win32/win32dep.c Mon Sep 13 09:57:03 2010 +0000
@@ -35,7 +35,7 @@
static char *app_data_dir = NULL, *install_dir = NULL,
*lib_dir = NULL, *locale_dir = NULL;
-static HINSTANCE libpurpledll_hInstance = 0;
+static HINSTANCE libpurpledll_hInstance = NULL;
/*
* PUBLIC CODE
@@ -77,16 +77,23 @@
BOOL did_load = FALSE;
FARPROC proc = 0;
- if(!(hmod = GetModuleHandle(dllname))) {
+ wchar_t *wc_dllname = g_utf8_to_utf16(dllname, -1, NULL, NULL, NULL);
+
+ if(!(hmod = GetModuleHandleW(wc_dllname))) {
purple_debug_warning("wpurple", "%s not already loaded; loading it...\n", dllname);
- if(!(hmod = LoadLibrary(dllname))) {
- purple_debug_error("wpurple", "Could not load: %s\n", dllname);
+ if(!(hmod = LoadLibraryW(wc_dllname))) {
+ purple_debug_error("wpurple", "Could not load: %s (%s)\n", dllname,
+ g_win32_error_message(GetLastError()));
+ g_free(wc_dllname);
return NULL;
}
else
did_load = TRUE;
}
+ g_free(wc_dllname);
+ wc_dllname = NULL;
+
if((proc = GetProcAddress(hmod, procedure))) {
purple_debug_info("wpurple", "This version of %s contains %s\n",
dllname, procedure);
@@ -124,7 +131,7 @@
if (!initialized) {
char *tmp = NULL;
wchar_t winstall_dir[MAXPATHLEN];
- if (GetModuleFileNameW(NULL, winstall_dir,
+ if (GetModuleFileNameW(libpurpledll_hInstance, winstall_dir,
MAXPATHLEN) > 0) {
tmp = g_utf16_to_utf8(winstall_dir, -1,
NULL, NULL, NULL);
diff -r 581a070c3737 -r 66981e71af29 pidgin.spec.in
--- a/pidgin.spec.in Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin.spec.in Mon Sep 13 09:57:03 2010 +0000
@@ -46,12 +46,14 @@
%if "%{_vendor}" == "suse"
# For SuSE:
BuildRequires: gnutls-devel
+%define sslopts "--enable-gnutls=yes --enable-nss=no"
%{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
%{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
Requires(pre): gconf2
Requires(post): gconf2
Requires(preun): gconf2
%else
+%define sslopts "--enable-gnutls=no --enable-nss=yes"
%{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
Requires(pre): GConf2
@@ -230,6 +232,7 @@
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
--disable-schemas-install \
+ %{sslopts} \
%{!?_with_vv:--disable-vv} \
%{!?_with_dbus:--disable-dbus} \
%{!?_with_avahi:--disable-avahi} \
@@ -471,6 +474,9 @@
%endif
%changelog
+* Wed Sep 01 2010 Stu Tomlinson
+- Ensure predictable use of SSL libs
+
* Wed Jun 02 2010 Stu Tomlinson
- add an option to build RPMs using --enable-trayicon-compat
(--with trayiconcompat)
diff -r 581a070c3737 -r 66981e71af29 pidgin/Makefile.am
--- a/pidgin/Makefile.am Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/Makefile.am Mon Sep 13 09:57:03 2010 +0000
@@ -5,9 +5,6 @@
Makefile.mingw \
pidgin.pc.in \
pidgin-uninstalled.pc.in \
- win32/IdleTracker/Makefile.mingw \
- win32/IdleTracker/idletrack.c \
- win32/IdleTracker/idletrack.h \
win32/MinimizeToTray.h \
win32/MinimizeToTray.c \
win32/pidgin_dll_rc.rc.in \
diff -r 581a070c3737 -r 66981e71af29 pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/Makefile.mingw Mon Sep 13 09:57:03 2010 +0000
@@ -33,7 +33,6 @@
INCLUDE_PATHS += \
$(PURPLE_INCLUDE_PATHS) \
- -I$(PIDGIN_IDLETRACK_TOP) \
-I$(PIDGIN_TOP) \
-I$(PIDGIN_TOP)/win32 \
-I$(GTK_TOP)/include/gtk-2.0 \
@@ -45,8 +44,7 @@
LIB_PATHS += -L$(GTK_TOP)/lib \
-L$(PURPLE_TOP) \
- -L$(PIDGIN_TOP) \
- -L$(PIDGIN_IDLETRACK_TOP)
+ -L$(PIDGIN_TOP)
##
## SOURCES, OBJECTS
@@ -121,7 +119,6 @@
-lgthread-2.0 \
-lpurple \
-lz \
- -lidletrack \
-lgtk-win32-2.0 \
-latk-1.0 \
-lpango-1.0 \
@@ -151,7 +148,6 @@
install: install_shallow all
$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) install
- $(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) install
win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
@@ -159,7 +155,7 @@
$(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)
-$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
+$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_OBJECTS)
$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(EXE_OBJECTS) $(PIDGIN_TARGET).dll
@@ -169,7 +165,6 @@
## CLEAN RULES
##
clean:
- $(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) clean
rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkblist.c Mon Sep 13 09:57:03 2010 +0000
@@ -3653,6 +3653,9 @@
***************************************************/
static GtkItemFactoryEntry blist_menu[] =
{
+/* NOTE: Do not set any accelerator to Control+O. It is mapped by
+ gtk_blist_key_press_cb to "Get User Info" on the selected buddy. */
+
/* Buddies menu */
{ N_("/_Buddies"), NULL, NULL, 0, "", NULL },
{ N_("/Buddies/New Instant _Message..."), "M", pidgin_dialogs_im, 0, "", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
@@ -3686,7 +3689,7 @@
{ N_("/Tools/Plu_gins"), "U", pidgin_plugin_dialog_show, 2, "", PIDGIN_STOCK_TOOLBAR_PLUGINS },
{ N_("/Tools/Pr_eferences"), "P", pidgin_prefs_show, 0, "", GTK_STOCK_PREFERENCES },
{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "- ", NULL },
- { N_("/Tools/Set _Mood"), "O", set_mood_show, 0, "
- ", NULL },
+ { N_("/Tools/Set _Mood"), "D", set_mood_show, 0, "
- ", NULL },
{ "/Tools/sep2", NULL, NULL, 0, "", NULL },
{ N_("/Tools/_File Transfers"), "T", pidgin_xfer_dialog_show, 0, "", PIDGIN_STOCK_TOOLBAR_TRANSFER },
{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "
- ", NULL },
@@ -3965,7 +3968,6 @@
tmp);
g_free(tmp);
}
- count = 0;
count = purple_blist_get_group_size(group, FALSE);
if (count != 0) {
@@ -3976,7 +3978,6 @@
tmp);
g_free(tmp);
}
- count = 0;
tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n");
g_string_append(str, tmp);
@@ -4023,7 +4024,6 @@
{
PurpleBuddy *buddy = NULL;
struct _pidgin_blist_node *gtknode = node->ui_data;
- struct _pidgin_blist_node *gtkbuddynode = NULL;
PurplePlugin *prpl;
PurplePluginProtocolInfo *prpl_info;
const char *name = NULL;
@@ -4034,11 +4034,9 @@
if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
if(!gtknode->contact_expanded) {
buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
- gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data;
}
} else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
buddy = (PurpleBuddy*)node;
- gtkbuddynode = node->ui_data;
p = purple_buddy_get_presence(buddy);
if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
/* This emblem comes from the small emoticon set now,
@@ -4131,7 +4129,6 @@
pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
{
GdkPixbuf *ret;
- const char *protoname = NULL;
const char *icon = NULL;
struct _pidgin_blist_node *gtknode = node->ui_data;
struct _pidgin_blist_node *gtkbuddynode = NULL;
@@ -4158,7 +4155,6 @@
if(buddy || chat) {
PurpleAccount *account;
PurplePlugin *prpl;
- PurplePluginProtocolInfo *prpl_info;
if(buddy)
account = buddy->account;
@@ -4168,12 +4164,6 @@
prpl = purple_find_prpl(purple_account_get_protocol_id(account));
if(!prpl)
return NULL;
-
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
-
- if(prpl_info && prpl_info->list_icon) {
- protoname = prpl_info->list_icon(account, buddy);
- }
}
if(buddy) {
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkconv.c Mon Sep 13 09:57:03 2010 +0000
@@ -750,9 +750,9 @@
do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info)
{
const char *buddy, *message;
- PidginConversation *gtkconv;
-
- gtkconv = PIDGIN_CONVERSATION(info->conv);
+ PurpleConversation *conv;
+
+ conv = info->conv;
if (resp == GTK_RESPONSE_OK) {
buddy = gtk_entry_get_text(GTK_ENTRY(info->entry));
@@ -761,8 +761,8 @@
if (!g_ascii_strcasecmp(buddy, ""))
return;
- serv_chat_invite(purple_conversation_get_gc(info->conv),
- purple_conv_chat_get_id(PURPLE_CONV_CHAT(info->conv)),
+ serv_chat_invite(purple_conversation_get_gc(conv),
+ purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
message, buddy);
}
@@ -856,7 +856,6 @@
InviteBuddyInfo *info = NULL;
if (invite_dialog == NULL) {
- PurpleConnection *gc;
PidginWindow *gtkwin;
GtkWidget *label;
GtkWidget *vbox, *hbox;
@@ -869,7 +868,6 @@
info = g_new0(InviteBuddyInfo, 1);
info->conv = conv;
- gc = purple_conversation_get_gc(conv);
gtkwin = pidgin_conv_get_window(gtkconv);
/* Create the new dialog. */
@@ -1200,12 +1198,10 @@
menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)
{
PidginWindow *win = data;
- PurpleConversation *conv;
PidginConversation *gtkconv;
GtkIMHtmlToolbar *toolbar;
gtkconv = pidgin_conv_window_get_active_gtkconv(win);
- conv = gtkconv->active_conv;
toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image),
@@ -1911,10 +1907,8 @@
conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
{
PidginWindow *win;
- PurpleConversation *conv;
int curconv;
- conv = gtkconv->active_conv;
win = gtkconv->win;
curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
@@ -2009,13 +2003,11 @@
static gboolean
entry_key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer data)
{
- PidginWindow *win;
PurpleConversation *conv;
PidginConversation *gtkconv;
gtkconv = (PidginConversation *)data;
conv = gtkconv->active_conv;
- win = gtkconv->win;
if (conv_keypress_common(gtkconv, event))
return TRUE;
@@ -2350,12 +2342,9 @@
gchar *new_text, gint new_text_length, gpointer user_data)
{
PidginConversation *gtkconv = (PidginConversation *)user_data;
- PurpleConversation *conv;
g_return_if_fail(gtkconv != NULL);
- conv = gtkconv->active_conv;
-
if (!purple_prefs_get_bool("/purple/conversations/im/send_typing"))
return;
@@ -2617,7 +2606,6 @@
PidginConversation *gtkconv = (PidginConversation *)data;
PurpleConversation *conv = gtkconv->active_conv;
PurpleAccount *account;
- PurplePluginProtocolInfo *prpl_info = NULL;
GdkPixbuf *buf;
GdkPixbuf *scale;
@@ -2628,9 +2616,7 @@
gtkconv = PIDGIN_CONVERSATION(conv);
account = purple_conversation_get_account(conv);
- if(account && account->gc) {
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
- } else {
+ if (!(account && account->gc)) {
gtkconv->u.im->icon_timer = 0;
return FALSE;
}
@@ -2702,7 +2688,6 @@
GList *children;
GtkWidget *event;
PurpleConversation *conv = gtkconv->active_conv;
- PidginWindow *gtkwin;
g_return_if_fail(conv != NULL);
@@ -2730,8 +2715,6 @@
gtkconv->u.im->anim = NULL;
gtkconv->u.im->iter = NULL;
gtkconv->u.im->show_icon = FALSE;
-
- gtkwin = gtkconv->win;
}
static void
@@ -3684,13 +3667,10 @@
static void
update_typing_icon(PidginConversation *gtkconv)
{
- PidginWindow *gtkwin;
PurpleConvIm *im = NULL;
PurpleConversation *conv = gtkconv->active_conv;
char *message = NULL;
- gtkwin = gtkconv->win;
-
if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
im = PURPLE_CONV_IM(conv);
@@ -5740,10 +5720,8 @@
time_t mtime)
{
PidginConversation *gtkconv;
- PidginWindow *win;
PurpleConnection *gc;
PurpleAccount *account;
- PurplePluginProtocolInfo *prpl_info;
int gtk_font_options = 0;
int gtk_font_options_all = 0;
int max_scrollback_lines;
@@ -5830,9 +5808,6 @@
g_free(tmp);
}
- win = gtkconv->win;
- prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
-
line_count = gtk_text_buffer_get_line_count(
gtk_text_view_get_buffer(GTK_TEXT_VIEW(
gtkconv->imhtml)));
@@ -6263,7 +6238,6 @@
pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user)
{
PurpleConvChat *chat;
- PurpleConvChatBuddyFlags flags;
PurpleConvChatBuddy *cbuddy;
PidginConversation *gtkconv;
PidginChatPane *gtkchat;
@@ -6306,8 +6280,6 @@
g_return_if_fail(alias != NULL);
- flags = purple_conv_chat_user_get_flags(chat, user);
-
cbuddy = purple_conv_chat_cb_find(chat, user);
if (cbuddy)
add_chat_buddy_common(conv, cbuddy, NULL);
@@ -6729,7 +6701,6 @@
PurpleConvIm *im = NULL;
PurpleAccount *account = purple_conversation_get_account(conv);
PurpleBuddy *buddy = NULL;
- PurplePresence *p = NULL;
char *markup = NULL;
AtkObject *accessibility_obj;
/* I think this is a little longer than it needs to be but I'm lazy. */
@@ -6749,7 +6720,6 @@
if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
buddy = purple_find_buddy(account, conv->name);
if (buddy) {
- p = purple_buddy_get_presence(buddy);
markup = pidgin_blist_get_name_markup(buddy, FALSE, FALSE);
} else {
markup = title;
@@ -6964,7 +6934,6 @@
int size = 0;
PurpleAccount *account;
- PurplePluginProtocolInfo *prpl_info = NULL;
PurpleBuddyIcon *icon;
@@ -6981,8 +6950,6 @@
return;
account = purple_conversation_get_account(conv);
- if(account && account->gc)
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
/* Remove the current icon stuff */
children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container));
@@ -8627,7 +8594,7 @@
static gboolean
notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
{
- gint nb_x, nb_y, x_rel, y_rel;
+ gint nb_x, nb_y;
int tab_clicked;
GtkWidget *page;
GtkWidget *tab;
@@ -8670,9 +8637,6 @@
*/
gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y);
- x_rel = e->x_root - nb_x;
- y_rel = e->y_root - nb_y;
-
/* Reset the min/max x/y */
win->drag_min_x = 0;
win->drag_min_y = 0;
@@ -9239,6 +9203,7 @@
if (win && win->window &&
!GTK_WIDGET_VISIBLE(win->window) && conv_width != 0) {
+#ifdef _WIN32 /* only override window manager placement on Windows */
/* ...check position is on screen... */
if (conv_x >= gdk_screen_width())
conv_x = gdk_screen_width() - 100;
@@ -9251,7 +9216,6 @@
conv_y = 100;
/* ...and move it back. */
-#ifdef _WIN32 /* only override window manager placement on Windows */
gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y);
#endif
gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height);
@@ -9503,7 +9467,7 @@
gtk_widget_show(gtkconv->menu_tabby);
- if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
+ if (conv_type == PURPLE_CONV_TYPE_IM)
pidgin_conv_update_buddy_icon(conv);
/* Build and set conversations tab */
@@ -9630,9 +9594,7 @@
pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
{
unsigned int index;
- PurpleConversationType conv_type;
-
- conv_type = purple_conversation_get_type(gtkconv->active_conv);
+
index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont);
g_object_ref(gtkconv->tab_cont);
@@ -9965,12 +9927,9 @@
static void
conv_placement_by_group(PidginConversation *conv)
{
- PurpleConversationType type;
PurpleGroup *group = NULL;
GList *wl, *cl;
- type = purple_conversation_get_type(conv->active_conv);
-
group = conv_get_group(conv);
/* Go through the list of IMs and find one with this group. */
@@ -10004,12 +9963,10 @@
static void
conv_placement_by_account(PidginConversation *conv)
{
- PurpleConversationType type;
GList *wins, *convs;
PurpleAccount *account;
account = purple_conversation_get_account(conv->active_conv);
- type = purple_conversation_get_type(conv->active_conv);
/* Go through the list of IMs and find one with this group. */
for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkdialogs.c Mon Sep 13 09:57:03 2010 +0000
@@ -1288,7 +1288,7 @@
purple_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name);
/* TODO - Should remove from blist first... then call purple_account_remove_buddy()? */
- purple_account_remove_buddy(buddy->account, buddy, group);
+ purple_account_remove_buddy(account, buddy, group);
purple_blist_remove_buddy(buddy);
g_free(name);
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkft.c
--- a/pidgin/gtkft.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkft.c Mon Sep 13 09:57:03 2010 +0000
@@ -112,13 +112,10 @@
get_xfer_info_strings(PurpleXfer *xfer, char **kbsec, char **time_elapsed,
char **time_remaining)
{
- PidginXferUiData *data;
double kb_sent, kb_rem;
double kbps = 0.0;
time_t elapsed, now;
- data = PIDGINXFER(xfer);
-
if (xfer->end_time != 0)
now = xfer->end_time;
else
@@ -159,7 +156,7 @@
*time_remaining = g_strdup(_("Finished"));
}
else if (purple_xfer_is_canceled(xfer)) {
- *time_remaining = g_strdup(_("Canceled"));
+ *time_remaining = g_strdup(_("Cancelled"));
}
else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
*time_remaining = g_strdup(_("Unknown"));
@@ -995,7 +992,7 @@
GTK_ICON_SIZE_MENU, NULL);
if (purple_xfer_is_canceled(xfer))
- status = _("Canceled");
+ status = _("Cancelled");
else
status = _("Failed");
@@ -1015,7 +1012,6 @@
{
PidginXferUiData *data;
char *size_str, *remaining_str;
- GtkTreeSelection *selection;
time_t current_time;
GtkTreeIter iter;
gboolean valid;
@@ -1066,8 +1062,6 @@
g_object_unref(pixbuf);
}
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(xfer_dialog->tree));
-
update_title_progress(dialog);
if (xfer == dialog->selected_xfer)
update_detailed_info(xfer_dialog, xfer);
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkft.h
--- a/pidgin/gtkft.h Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkft.h Mon Sep 13 09:57:03 2010 +0000
@@ -88,10 +88,10 @@
PurpleXfer *xfer);
/**
- * Indicate in a file transfer dialog that a transfer was canceled.
+ * Indicate in a file transfer dialog that a transfer was cancelled.
*
* @param dialog The file transfer dialog.
- * @param xfer The file transfer that was canceled.
+ * @param xfer The file transfer that was cancelled.
*/
void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
PurpleXfer *xfer);
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkidle.c
--- a/pidgin/gtkidle.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkidle.c Mon Sep 13 09:57:03 2010 +0000
@@ -29,7 +29,7 @@
#else
# ifdef USE_SCREENSAVER
# ifdef _WIN32
-# include "idletrack.h"
+# include "gtkwin32dep.h"
# else
/* We're on X11 and not MacOS X with IOKit. */
# include
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkimhtml.c Mon Sep 13 09:57:03 2010 +0000
@@ -1476,10 +1476,8 @@
static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
{
GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
- GtkObjectClass *object_class;
GtkBindingSet *binding_set;
GObjectClass *gobject_class;
- object_class = (GtkObjectClass*) klass;
gobject_class = (GObjectClass*) klass;
parent_class = g_type_class_ref(GTK_TYPE_TEXT_VIEW);
signals[URL_CLICKED] = g_signal_new("url_clicked",
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkimhtmltoolbar.c Mon Sep 13 09:57:03 2010 +0000
@@ -1205,9 +1205,7 @@
/* Boring GTK+ stuff */
static void gtk_imhtmltoolbar_class_init (GtkIMHtmlToolbarClass *class)
{
- GtkObjectClass *object_class;
GObjectClass *gobject_class;
- object_class = (GtkObjectClass*) class;
gobject_class = (GObjectClass*) class;
parent_class = g_type_class_ref(GTK_TYPE_HBOX);
gobject_class->finalize = gtk_imhtmltoolbar_finalize;
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkplugin.c
--- a/pidgin/gtkplugin.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkplugin.c Mon Sep 13 09:57:03 2010 +0000
@@ -800,5 +800,8 @@
g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (prefs_plugin_sel), NULL);
g_signal_connect(G_OBJECT(plugin_dialog), "response", G_CALLBACK(plugin_dialog_response_cb), sel);
gtk_window_set_default_size(GTK_WINDOW(plugin_dialog), 430, 530);
+
+ pidgin_auto_parent_window(plugin_dialog);
+
gtk_widget_show_all(plugin_dialog);
}
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkpounce.c
--- a/pidgin/gtkpounce.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkpounce.c Mon Sep 13 09:57:03 2010 +0000
@@ -194,7 +194,6 @@
{
GtkTreeIter iter;
PurpleAccount *account;
- PurplePounceEvent events;
gboolean recurring;
const char *pouncer;
const char *pouncee;
@@ -202,8 +201,6 @@
account = purple_pounce_get_pouncer(pounce);
- events = purple_pounce_get_events(pounce);
-
pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
pouncer = purple_account_get_username(account);
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkprefs.c Mon Sep 13 09:57:03 2010 +0000
@@ -1042,11 +1042,40 @@
}
static GtkWidget *
+add_theme_prefs_combo(GtkWidget *vbox,
+ GtkSizeGroup *combo_sg, GtkSizeGroup *label_sg,
+ GtkListStore *theme_store,
+ GCallback combo_box_cb, gpointer combo_box_cb_user_data,
+ const char *label_str, const char *prefs_path,
+ const char *theme_type)
+{
+ GtkWidget *label;
+ GtkWidget *combo_box = NULL;
+ GtkWidget *themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+
+ label = gtk_label_new(label_str);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_size_group_add_widget(label_sg, label);
+ gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
+
+ combo_box = prefs_build_theme_combo_box(theme_store,
+ purple_prefs_get_string(prefs_path),
+ theme_type);
+ g_signal_connect(G_OBJECT(combo_box), "changed",
+ (GCallback)combo_box_cb, combo_box_cb_user_data);
+ gtk_size_group_add_widget(combo_sg, combo_box);
+ gtk_box_pack_start(GTK_BOX(themesel_hbox), combo_box, TRUE, TRUE, 0);
+
+ gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+
+ return combo_box;
+}
+
+static GtkWidget *
theme_page(void)
{
+ GtkWidget *label;
GtkWidget *ret, *vbox;
- GtkWidget *label;
- GtkWidget *themesel_hbox;
GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -1067,76 +1096,28 @@
gtk_widget_show(label);
/* Buddy List Themes */
- themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
- label = gtk_label_new(_("Buddy List Theme:"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_size_group_add_widget(label_sg, label);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
- prefs_blist_themes_combo_box = prefs_build_theme_combo_box(prefs_blist_themes,
- purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"),
- "blist");
- g_signal_connect(G_OBJECT(prefs_blist_themes_combo_box), "changed",
- (GCallback)prefs_set_blist_theme_cb, NULL);
- gtk_size_group_add_widget(combo_sg, prefs_blist_themes_combo_box);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_blist_themes_combo_box, TRUE, TRUE, 0);
-
- gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+ prefs_blist_themes_combo_box = add_theme_prefs_combo(
+ vbox, combo_sg, label_sg, prefs_blist_themes,
+ (GCallback)prefs_set_blist_theme_cb, NULL,
+ _("Buddy List Theme:"), PIDGIN_PREFS_ROOT "/blist/theme", "blist");
/* Status Icon Themes */
- themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
- label = gtk_label_new(_("Status Icon Theme:"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_size_group_add_widget(label_sg, label);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
- prefs_status_themes_combo_box = prefs_build_theme_combo_box(prefs_status_icon_themes,
- purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme"),
- "icon");
- g_signal_connect(G_OBJECT(prefs_status_themes_combo_box), "changed",
- (GCallback)prefs_set_status_icon_theme_cb, NULL);
- gtk_size_group_add_widget(combo_sg, prefs_status_themes_combo_box);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_status_themes_combo_box, TRUE, TRUE, 0);
-
- gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+ prefs_status_themes_combo_box = add_theme_prefs_combo(
+ vbox, combo_sg, label_sg, prefs_status_icon_themes,
+ (GCallback)prefs_set_status_icon_theme_cb, NULL,
+ _("Status Icon Theme:"), PIDGIN_PREFS_ROOT "/status/icon-theme", "icon");
/* Sound Themes */
- themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
- label = gtk_label_new(_("Sound Theme:"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_size_group_add_widget(label_sg, label);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
- prefs_sound_themes_combo_box = prefs_build_theme_combo_box(prefs_sound_themes,
- purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"),
- "sound");
- g_signal_connect(G_OBJECT(prefs_sound_themes_combo_box), "changed",
- (GCallback)prefs_set_sound_theme_cb, NULL);
- gtk_size_group_add_widget(combo_sg, prefs_sound_themes_combo_box);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_sound_themes_combo_box, TRUE, TRUE, 0);
-
- gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+ prefs_sound_themes_combo_box = add_theme_prefs_combo(
+ vbox, combo_sg, label_sg, prefs_sound_themes,
+ (GCallback)prefs_set_sound_theme_cb, NULL,
+ _("Sound Theme:"), PIDGIN_PREFS_ROOT "/sound/theme", "sound");
/* Smiley Themes */
- themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
- label = gtk_label_new(_("Smiley Theme:"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_size_group_add_widget(label_sg, label);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
- prefs_smiley_themes_combo_box = prefs_build_theme_combo_box(prefs_smiley_themes,
- purple_prefs_get_string(PIDGIN_PREFS_ROOT "/smileys/theme"),
- "smiley");
- g_signal_connect(G_OBJECT(prefs_smiley_themes_combo_box), "changed",
- (GCallback)prefs_set_smiley_theme_cb, NULL);
- gtk_size_group_add_widget(combo_sg, prefs_smiley_themes_combo_box);
- gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_smiley_themes_combo_box, TRUE, TRUE, 0);
-
- gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+ prefs_smiley_themes_combo_box = add_theme_prefs_combo(
+ vbox, combo_sg, label_sg, prefs_smiley_themes,
+ (GCallback)prefs_set_smiley_theme_cb, NULL,
+ _("Smiley Theme:"), PIDGIN_PREFS_ROOT "/smileys/theme", "smiley");
/* Custom sort so "none" theme is at top of list */
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(prefs_smiley_themes),
@@ -1809,9 +1790,10 @@
hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"),
sg, entry, TRUE, NULL);
-
- pidgin_prefs_labeled_spin_button(hbox, _("_Port:"),
+
+ pidgin_prefs_labeled_spin_button(hbox, _("_UDP Port:"),
"/purple/network/turn_port", 0, 65535, NULL);
+
hbox = pidgin_prefs_labeled_entry(vbox, _("Use_rname:"),
"/purple/network/turn_username", sg);
pidgin_prefs_labeled_password(hbox, _("Pass_word:"),
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkroomlist.c
--- a/pidgin/gtkroomlist.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkroomlist.c Mon Sep 13 09:57:03 2010 +0000
@@ -362,8 +362,6 @@
style = grl->tipwindow->style;
- max_text_width = 0;
-
max_text_width = MAX(grl->tip_width, grl->tip_name_width);
max_width = TOOLTIP_BORDER + SMALL_SPACE + max_text_width + TOOLTIP_BORDER;
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtksession.c
--- a/pidgin/gtksession.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtksession.c Mon Sep 13 09:57:03 2010 +0000
@@ -166,7 +166,7 @@
ret[j++] = g_strdup("--display");
ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default()));
- ret[j++] = NULL;
+ ret[j] = NULL;
return ret;
}
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtksmiley.c
--- a/pidgin/gtksmiley.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtksmiley.c Mon Sep 13 09:57:03 2010 +0000
@@ -520,9 +520,6 @@
GtkTreeIter *iter, gpointer data)
{
PurpleSmiley *smiley = NULL;
- SmileyManager *dialog;
-
- dialog = (SmileyManager*)data;
gtk_tree_model_get(model, iter,
SMILEY, &smiley,
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkstatusbox.c Mon Sep 13 09:57:03 2010 +0000
@@ -657,7 +657,6 @@
static void
pidgin_status_box_refresh(PidginStatusBox *status_box)
{
- GtkIconSize icon_size;
GtkStyle *style;
char aa_color[8];
PurpleSavedStatus *saved_status;
@@ -668,8 +667,6 @@
gboolean account_status = FALSE;
PurpleAccount *acct = (status_box->account) ? status_box->account : status_box->token_status_account;
- icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-
style = gtk_widget_get_style(GTK_WIDGET(status_box));
snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x",
style->text_aa[GTK_STATE_NORMAL].red >> 8,
@@ -969,11 +966,7 @@
PurpleSavedStatus *saved = cur->data;
const gchar *message;
gchar *stripped = NULL;
- PurpleStatusPrimitive prim;
- PidginStatusBoxItemType type = PIDGIN_STATUS_BOX_TYPE_POPULAR;
-
- /* Get an appropriate status icon */
- prim = purple_savedstatus_get_type(saved);
+ PidginStatusBoxItemType type;
if (purple_savedstatus_is_transient(saved))
{
@@ -982,16 +975,18 @@
* API returns the message when purple_savedstatus_get_title() is
* called, so we don't need to get the message a second time.
*/
+ type = PIDGIN_STATUS_BOX_TYPE_POPULAR;
}
else
{
+ type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR;
+
message = purple_savedstatus_get_message(saved);
if (message != NULL)
{
stripped = purple_markup_strip_html(message);
purple_util_chrreplace(stripped, '\n', ' ');
}
- type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR;
}
pidgin_status_box_add(statusbox, type,
@@ -1074,17 +1069,13 @@
PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL,
purple_status_type_get_name(status_type),
NULL,
- GINT_TO_POINTER(purple_status_type_get_primitive(status_type)));
+ GINT_TO_POINTER(prim));
}
}
static void
pidgin_status_box_regenerate(PidginStatusBox *status_box, gboolean status_changed)
{
- GtkIconSize icon_size;
-
- icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-
/* Unset the model while clearing it */
gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), NULL);
gtk_list_store_clear(status_box->dropdown_store);
diff -r 581a070c3737 -r 66981e71af29 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/gtkutils.c Mon Sep 13 09:57:03 2010 +0000
@@ -680,7 +680,6 @@
create_protocols_menu(const char *default_proto_id)
{
AopMenu *aop_menu = NULL;
- PurplePluginProtocolInfo *prpl_info;
PurplePlugin *plugin;
GdkPixbuf *pixbuf = NULL;
GtkSizeGroup *sg;
@@ -702,7 +701,6 @@
p = p->next, i++) {
plugin = (PurplePlugin *)p->data;
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
@@ -784,8 +782,6 @@
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
for (p = list, i = 0; p != NULL; p = p->next, i++) {
- PurplePlugin *plugin;
-
if (show_all)
account = (PurpleAccount *)p->data;
else {
@@ -799,8 +795,6 @@
continue;
}
- plugin = purple_find_prpl(purple_account_get_protocol_id(account));
-
pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
if (pixbuf) {
@@ -2790,79 +2784,78 @@
gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf) {
- int width, height, rowstride, i;
- unsigned char *pixels;
- unsigned char *row;
-
- if (!gdk_pixbuf_get_has_alpha(pixbuf))
- return TRUE;
-
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
- rowstride = gdk_pixbuf_get_rowstride (pixbuf);
- pixels = gdk_pixbuf_get_pixels (pixbuf);
-
- row = pixels;
- for (i = 3; i < rowstride; i+=4) {
- if (row[i] < 0xfe)
- return FALSE;
- }
-
- for (i = 1; i < height - 1; i++) {
- row = pixels + (i*rowstride);
- if (row[3] < 0xfe || row[rowstride-1] < 0xfe) {
- return FALSE;
- }
- }
-
- row = pixels + ((height-1) * rowstride);
- for (i = 3; i < rowstride; i+=4) {
- if (row[i] < 0xfe)
- return FALSE;
- }
-
- return TRUE;
+ int height, rowstride, i;
+ unsigned char *pixels;
+ unsigned char *row;
+
+ if (!gdk_pixbuf_get_has_alpha(pixbuf))
+ return TRUE;
+
+ height = gdk_pixbuf_get_height (pixbuf);
+ rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+ pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+ row = pixels;
+ for (i = 3; i < rowstride; i+=4) {
+ if (row[i] < 0xfe)
+ return FALSE;
+ }
+
+ for (i = 1; i < height - 1; i++) {
+ row = pixels + (i * rowstride);
+ if (row[3] < 0xfe || row[rowstride - 1] < 0xfe) {
+ return FALSE;
+ }
+ }
+
+ row = pixels + ((height - 1) * rowstride);
+ for (i = 3; i < rowstride; i += 4) {
+ if (row[i] < 0xfe)
+ return FALSE;
+ }
+
+ return TRUE;
}
void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf) {
int width, height, rowstride;
- guchar *pixels;
- if (!gdk_pixbuf_get_has_alpha(pixbuf))
- return;
- width = gdk_pixbuf_get_width(pixbuf);
- height = gdk_pixbuf_get_height(pixbuf);
- rowstride = gdk_pixbuf_get_rowstride(pixbuf);
- pixels = gdk_pixbuf_get_pixels(pixbuf);
-
- if (width < 6 || height < 6)
- return;
- /* Top left */
- pixels[3] = 0;
- pixels[7] = 0x80;
- pixels[11] = 0xC0;
- pixels[rowstride + 3] = 0x80;
- pixels[rowstride * 2 + 3] = 0xC0;
-
- /* Top right */
- pixels[width * 4 - 1] = 0;
- pixels[width * 4 - 5] = 0x80;
- pixels[width * 4 - 9] = 0xC0;
- pixels[rowstride + (width * 4) - 1] = 0x80;
- pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-
- /* Bottom left */
- pixels[(height - 1) * rowstride + 3] = 0;
- pixels[(height - 1) * rowstride + 7] = 0x80;
- pixels[(height - 1) * rowstride + 11] = 0xC0;
- pixels[(height - 2) * rowstride + 3] = 0x80;
- pixels[(height - 3) * rowstride + 3] = 0xC0;
-
- /* Bottom right */
- pixels[height * rowstride - 1] = 0;
- pixels[(height - 1) * rowstride - 1] = 0x80;
- pixels[(height - 2) * rowstride - 1] = 0xC0;
- pixels[height * rowstride - 5] = 0x80;
- pixels[height * rowstride - 9] = 0xC0;
+ guchar *pixels;
+ if (!gdk_pixbuf_get_has_alpha(pixbuf))
+ return;
+ width = gdk_pixbuf_get_width(pixbuf);
+ height = gdk_pixbuf_get_height(pixbuf);
+ rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+ pixels = gdk_pixbuf_get_pixels(pixbuf);
+
+ if (width < 6 || height < 6)
+ return;
+ /* Top left */
+ pixels[3] = 0;
+ pixels[7] = 0x80;
+ pixels[11] = 0xC0;
+ pixels[rowstride + 3] = 0x80;
+ pixels[rowstride * 2 + 3] = 0xC0;
+
+ /* Top right */
+ pixels[width * 4 - 1] = 0;
+ pixels[width * 4 - 5] = 0x80;
+ pixels[width * 4 - 9] = 0xC0;
+ pixels[rowstride + (width * 4) - 1] = 0x80;
+ pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
+
+ /* Bottom left */
+ pixels[(height - 1) * rowstride + 3] = 0;
+ pixels[(height - 1) * rowstride + 7] = 0x80;
+ pixels[(height - 1) * rowstride + 11] = 0xC0;
+ pixels[(height - 2) * rowstride + 3] = 0x80;
+ pixels[(height - 3) * rowstride + 3] = 0xC0;
+
+ /* Bottom right */
+ pixels[height * rowstride - 1] = 0;
+ pixels[(height - 1) * rowstride - 1] = 0x80;
+ pixels[(height - 2) * rowstride - 1] = 0xC0;
+ pixels[height * rowstride - 5] = 0x80;
+ pixels[height * rowstride - 9] = 0xC0;
}
const char *pidgin_get_dim_grey_string(GtkWidget *widget) {
diff -r 581a070c3737 -r 66981e71af29 pidgin/pidginstock.h
--- a/pidgin/pidginstock.h Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/pidginstock.h Mon Sep 13 09:57:03 2010 +0000
@@ -44,7 +44,7 @@
#define PIDGIN_STOCK_DOWNLOAD "pidgin-download"
#define PIDGIN_STOCK_EDIT "pidgin-edit"
#define PIDGIN_STOCK_FGCOLOR "pidgin-fgcolor"
-#define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-canceled"
+#define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-cancelled"
#define PIDGIN_STOCK_FILE_DONE "pidgin-file-done"
#define PIDGIN_STOCK_IGNORE "pidgin-ignore"
#define PIDGIN_STOCK_INFO "pidgin-info"
diff -r 581a070c3737 -r 66981e71af29 pidgin/pixmaps/emotes/default/24/default.theme.in
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in Mon Sep 13 09:57:03 2010 +0000
@@ -419,6 +419,98 @@
female-fighter.png o-+ O-+
yin-yang.png (%)
+# Following Yahoo! Messenger 8.1
+[Yahoo JAPAN]
+happy.png :) :-)
+question.png :-/ :-\\
+shocked.png :-O :O :-o :o
+devil.png >:)
+angel.png O:-) o:-) 0:-)
+sick.png :-&
+sleepy.png (:|
+hypnotized.png @-)
+on-the-phone.png :)]
+sad.png :( :-(
+amorous.png :x :-x :X :-X
+angry.png X-( x-( X( x(
+crying.png :((
+glasses-nerdy.png :-B :-b
+quiet.png :-$
+drool.png =P~ =p~
+lying.png :^O :^o
+call-me.png :-c
+wink.png ;) ;-)
+embarrassed.png :">
+mean.png :-> :>
+laugh.png :)) :-))
+bye.png =;
+arrogant.png [-(
+thinking.png :-?
+waiting.png :-w :-W
+at-wits-end.png ~x( ~X(
+excited.png :D :-D :d :-d
+tongue.png :-P :P :-p :p
+glasses-cool.png B-) b-)
+neutral.png :| :-|
+sleeping.png I-) i-) |-)
+clown.png :o) :O)
+doh.png #-o #-O
+weep.png :-<
+go-away.png :-h
+lashes.png ;;)
+kiss.png :-* :*
+confused.png :-S :-s
+sarcastic.png /:)
+eyeroll.png 8-|
+silly.png 8-}
+clap.png =D> =d>
+mad-tongue.png >:P >:p
+time-out.png :-t :-T
+hug-left.png >:D< >:d<
+love-over.png =((
+hot.png #:-S #:-s
+rotfl.png =)) :-j :-J
+loser.png L-) l-)
+party.png <:-P <:-p
+nervous.png :-SS :-Ss :-sS :-ss
+cowboy.png <):)
+desire.png 8->
+! skywalker.png C:-) c:-) C:) c:)
+! monkey.png :-(|) :(|)
+
+# Hidden Yahoo emotes
+alien.png =:) >-)
+beat-up.png b-( B-(
+chicken.png ~:>
+coffee.png ~o) ~O)
+cow.png 3:-O 3:-o
+dance.png \\:D/ \\:d/
+rose.png @};-
+dont-know.png :-L :-l
+skeleton.png 8-X 8-x
+lamp.png *-:)
+monkey.png :(|)
+coins.png $-)
+peace.png :)>-
+pig.png :@)
+pray.png [-o< [-O<
+pumpkin.png (~~)
+shame.png [-X [-x
+flag.png **==
+clover.png %%-
+musical-note.png :-"
+giggle.png ;))
+worship.png ^:)^
+star.png (*)
+waving.png >:/
+talktohand.png :-@
+
+# Only available after activating the Yahoo! Fighter IMVironment
+male-fighter1.png o-> O->
+male-fighter2.png o=> O=>
+female-fighter.png o-+ O-+
+yin-yang.png (%)
+
# Following MySpaceIM Beta 1.0.697.0
[MySpaceIM]
@@ -428,7 +520,7 @@
glasses-nerdy.png B)
bulgy-eyes.png %)
freaked-out.png :E
-smile.png :) :-)
+happy.png :) :-)
amorous.png :X
laugh.png :))
mohawk.png -:
diff -r 581a070c3737 -r 66981e71af29 pidgin/pixmaps/emotes/small/16/Makefile.am
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am Mon Sep 13 09:57:03 2010 +0000
@@ -34,7 +34,6 @@
confused.png \
console.png \
cold.png \
- cool.png \
cross.png \
crying.png \
devil.png \
@@ -44,7 +43,6 @@
excruciating.png \
eyeroll.png \
girl.png \
- grin.png \
happy.png \
hug-left.png \
hug-right.png \
@@ -77,6 +75,7 @@
star.png \
stressed.png \
thinking.png \
+ thunder.png \
tongue.png \
tv.png \
uhm-yeah.png \
diff -r 581a070c3737 -r 66981e71af29 pidgin/pixmaps/emotes/small/16/cool.png
Binary file pidgin/pixmaps/emotes/small/16/cool.png has changed
diff -r 581a070c3737 -r 66981e71af29 pidgin/pixmaps/emotes/small/16/glasses-cool.png
Binary file pidgin/pixmaps/emotes/small/16/glasses-cool.png has changed
diff -r 581a070c3737 -r 66981e71af29 pidgin/pixmaps/emotes/small/16/grin.png
Binary file pidgin/pixmaps/emotes/small/16/grin.png has changed
diff -r 581a070c3737 -r 66981e71af29 pidgin/pixmaps/emotes/small/16/small.theme.in
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in Mon Sep 13 09:57:03 2010 +0000
@@ -1,5 +1,5 @@
_Name=Small
-_Description=Smaller versions of the default smilies
+_Description=Smaller versions of the default smileys
Icon=wink.png
Author=Hylke Bons
@@ -13,10 +13,12 @@
tongue.png :P :p :-P :-p
shocked.png =-O =-o
kiss.png :-*
+glasses-cool.png 8-)
embarrassed.png :-[
crying.png :'( :'-(
thinking.png :-/ :-\\
angel.png O:-) o:-)
+shut-mouth.png :-X
[XMPP]
@@ -29,18 +31,23 @@
tongue.png :P :p :-P :-p
shocked.png =-O =-o :-O :-o
kiss.png :kiss: :-*
+glasses-cool.png 8-) B-)
embarrassed.png :-[
crying.png :'-( :'(
thinking.png :-/ :-\\
angel.png O:-) o:-)
+shut-mouth.png :-X
# Following XEP-0038 + GTalk
angry.png >:-( >:( X-( x-(
+rose.png @->-- :rose:
phone.png :telephone:
+lamp.png :jabber:
in_love.png :heart: :love: <3
musical-note.png :music:
beer.png :beer:
coffee.png :coffee:
+star.png :star:
# Others
neutral.png :| :-|
@@ -61,6 +68,8 @@
angel.png O:-)
thinking.png :-\\ :-/
crying.png :'(
+shut-mouth.png :-X
+glasses-cool.png 8-)
# Following Windows Live Messenger 8.1
@@ -70,6 +79,7 @@
wink.png ;) ;-)
shocked.png :-O :-o :O :o
tongue.png :-P :P :-p :p
+glasses-cool.png (H) (h)
angry.png :@ :-@
embarrassed.png :$ :-$
confused.png :S :s :-S :-s
@@ -79,21 +89,28 @@
devil.png (6)
angel.png (A) (a)
in_love.png (L) (l)
+star.png (*)
musical-note.png (8)
+rose.png (F) (f)
kiss.png (K) (k)
camera.png (P) (p)
+lamp.png (I) (i)
coffee.png (C) (c)
phone.png (T) (t)
hug-left.png ({)
hug-right.png (})
beer.png (B) (b)
+boy.png (Z) (z)
+girl.png (X) (x)
sarcastic.png ^o)
sick.png +o(
plate.png (pl)
mobile.png (mp)
dont-know.png :^)
thinking.png *-)
+thunder.png (li)
party.png <:o)
+eyeroll.png 8-)
sleepy.png |-)
# Hidden MSN emotes
@@ -106,28 +123,37 @@
shocked.png /:O /jy /surprised
party.png /8-) /dy /revel
crying.png /:< /ll /cry
+shut-mouth.png /:X /bz /shut_mouth
sleeping.png /:Z /shui /sleep
embarrassed.png /:-| /gg /embarassed
+pissed-off.png /:@ /fn /pissed_off
excited.png /:D /cy /toothy_smile
happy.png /:) /wx /small_smile
sad.png /:( /ng /sad
+glasses-cool.png /:+ /kuk /cool
sick.png /:T /tu /vomit
sleepy.png /|-) /kun /sleepy
hot.png /:L /sweat
question.png /? /yiw /question
+excruciating.png /:8 /zhem /excrutiating
afraid.png /shake /fad /shake
amorous.png /love /aiq /love
search.png /find /zhao /search
hug-left.png /hug /yb /hug
+lamp.png /! /dp /lightbulb
+thunder.png /li /shd /lightning
musical-note.png /music /yy /music
coffee.png /coffee /kf /coffee
hungry.png /eat /fan /eat
+rose.png /rose /mg /rose
kiss.png /kiss /wen /kiss
in_love.png /heart /xin /heart
meeting.png /meeting /hy /meeting
phone.png /phone /dh /phone
tv.png /TV /ds /TV
angry.png / /oh /angry
+girl.png /<00> /nv /woman
+boy.png /<11> /nan /man
# Following ICQ 6.0
@@ -146,9 +172,12 @@
embarrassed.png :-[
devil.png ]:->
angel.png O:-)
+rose.png @}->--
+shut-mouth.png :-X :X :-x :x
thinking.png :-\\ :-/
beer.png *DRINK*
excited.png :-D :D
+glasses-cool.png 8-)
amorous.png *IN\ LOVE*
@@ -165,17 +194,21 @@
amorous.png :x :-x :X :-X
angry.png X-( x-( X( x(
crying.png :((
+drool.png =P~ =p~
+lying.png :^O :^o
wink.png ;) ;-)
embarrassed.png :">
mean.png :-> :>
thinking.png :-?
excited.png :D :-D :d :-d
tongue.png :-P :P :-p :p
+glasses-cool.png B-) b-)
neutral.png :| :-|
sleeping.png I-) i-) |-)
kiss.png :-* :*
confused.png :-S :-s
sarcastic.png /:)
+eyeroll.png 8-|
hug-left.png >:D< >:d<
hot.png #:-S #:-s
party.png <:-P <:-p
@@ -183,38 +216,48 @@
# Hidden Yahoo emotes
coffee.png ~o) ~O)
+rose.png @};-
dont-know.png :-L :-l
+lamp.png *-:)
shame.png [-X [-x
musical-note.png :-"
+star.png (*)
# Following Yahoo! Messenger 8.1
[Yahoo JAPAN]
-smile.png :) :-)
+happy.png :) :-)
question.png :-/ :-\\
-shock.png :-O :O :-o :o
+shocked.png :-O :O :-o :o
devil.png >:)
angel.png O:-) o:-) 0:-)
sick.png :-&
-yawn.png (:|
+sleepy.png (:|
sad.png :( :-(
+amorous.png :x :-x :X :-X
angry.png X-( x-( X( x(
crying.png :((
wink.png ;) ;-)
thinking.png :-?
-smile-big.png :D :-D :d :-d
+excited.png :D :-D :d :-d
tongue.png :-P :P :-p :p
+glasses-cool.png B-) b-)
neutral.png :| :-|
-sleepy.png I-) i-) |-)
+sleeping.png I-) i-) |-)
kiss.png :-* :*
confused.png :-S :-s
+sarcastic.png /:)
+eyeroll.png 8-|
hug-left.png >:D< >:d<
party.png <:-P <:-p
# Hidden Yahoo emotes
coffee.png ~o) ~O)
+rose.png @};-
dont-know.png :-L :-l
+lamp.png *-:)
shame.png [-X [-x
musical-note.png :-"
+star.png (*)
# Following MySpaceIM Beta 1.0.697.0
@@ -222,10 +265,13 @@
excited.png :D :-D
devil.png }:)
confused.png :Z
+happy.png :) :-)
amorous.png :X
+pirate.png P)
shocked.png :O
neutral.png :|
tongue.png :P :p
+pissed-off.png B|
wink.png ;-) ;)
sad.png :[
kiss.png :x
@@ -240,7 +286,7 @@
shocked.png :-O :O
tongue.png :-P :P
embarrassed.png :-$ :$
-cool.png 8-)
+glasses-cool.png 8-)
in_love.png (H)
rose.png (F)
### Added in v3.0
@@ -252,7 +298,7 @@
lamp.png (i)
pissed-off.png :e :-e
shut-mouth.png :-x :x
-grumpy.png (z)
+thunder.png (z)
coffee.png (U)
mrgreen.png (G)
### Added in v5.0
@@ -265,7 +311,7 @@
drool.png :-~ :~
sleeping.png :-z :z
lying.png :L)
-nerdy.png 8-| 8|
+glasses-nerdy.png 8-| 8|
pirate.png P-)
### Added in v5.9.7
bored.png :-[ :[
diff -r 581a070c3737 -r 66981e71af29 pidgin/pixmaps/emotes/small/16/thunder.png
Binary file pidgin/pixmaps/emotes/small/16/thunder.png has changed
diff -r 581a070c3737 -r 66981e71af29 pidgin/plugins/gevolution/add_buddy_dialog.c
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Sep 13 09:57:03 2010 +0000
@@ -54,8 +54,7 @@
gevo_addrbooks_model_unref(dialog->addrbooks);
- if (dialog->username != NULL)
- g_free(dialog->username);
+ g_free(dialog->username);
g_free(dialog);
@@ -289,7 +288,7 @@
{
EContact *contact = E_CONTACT(c->data);
const char *name;
- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+ GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
@@ -299,9 +298,11 @@
msns = e_contact_get(contact, E_CONTACT_IM_MSN);
icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+ ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
if (aims == NULL && jabbers == NULL && yahoos == NULL &&
- msns == NULL && icqs == NULL && novells == NULL)
+ msns == NULL && icqs == NULL && novells == NULL &&
+ ggs == NULL)
{
GtkTreeIter iter;
@@ -320,6 +321,7 @@
add_ims(dialog, contact, name, msns, "prpl-msn");
add_ims(dialog, contact, name, icqs, "prpl-icq");
add_ims(dialog, contact, name, novells, "prpl-novell");
+ add_ims(dialog, contact, name, ggs, "prpl-gg");
}
}
@@ -365,7 +367,7 @@
{
EContact *contact = E_CONTACT(l->data);
const char *name;
- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+ GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
@@ -381,9 +383,11 @@
msns = e_contact_get(contact, E_CONTACT_IM_MSN);
icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+ ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
if (aims == NULL && jabbers == NULL && yahoos == NULL &&
- msns == NULL && icqs == NULL && novells == NULL)
+ msns == NULL && icqs == NULL && novells == NULL &&
+ ggs == NULL)
{
GtkTreeIter iter;
@@ -402,6 +406,7 @@
add_ims(dialog, contact, name, msns, "prpl-msn");
add_ims(dialog, contact, name, icqs, "prpl-icq");
add_ims(dialog, contact, name, novells, "prpl-novell");
+ add_ims(dialog, contact, name, ggs, "prpl-gg");
}
}
}
diff -r 581a070c3737 -r 66981e71af29 pidgin/plugins/gevolution/gevo-util.c
--- a/pidgin/plugins/gevolution/gevo-util.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/plugins/gevolution/gevo-util.c Mon Sep 13 09:57:03 2010 +0000
@@ -111,6 +111,8 @@
protocol_field = E_CONTACT_IM_JABBER;
else if (!strcmp(protocol_id, "prpl-novell"))
protocol_field = E_CONTACT_IM_GROUPWISE;
+ else if (!strcmp(protocol_id, "prpl-gg"))
+ protocol_field = E_CONTACT_IM_GADUGADU;
return protocol_field;
}
diff -r 581a070c3737 -r 66981e71af29 pidgin/plugins/gevolution/gevolution.c
--- a/pidgin/plugins/gevolution/gevolution.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/plugins/gevolution/gevolution.c Mon Sep 13 09:57:03 2010 +0000
@@ -125,6 +125,7 @@
update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ);
update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+ update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU);
}
static void
diff -r 581a070c3737 -r 66981e71af29 pidgin/plugins/gevolution/new_person_dialog.c
--- a/pidgin/plugins/gevolution/new_person_dialog.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/plugins/gevolution/new_person_dialog.c Mon Sep 13 09:57:03 2010 +0000
@@ -153,6 +153,8 @@
field = E_CONTACT_IM_MSN;
else if (!strcmp(im_service, "prpl-novell"))
field = E_CONTACT_IM_GROUPWISE;
+ else if (!strcmp(im_service, "prpl-gg"))
+ field = E_CONTACT_IM_GADUGADU;
if (field > 0)
{
@@ -202,8 +204,7 @@
if (name != NULL)
e_contact_name_free(name);
- if (full_name != NULL)
- g_free(full_name);
+ g_free(full_name);
delete_win_cb(NULL, NULL, dialog);
}
diff -r 581a070c3737 -r 66981e71af29 pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/plugins/notify.c Mon Sep 13 09:57:03 2010 +0000
@@ -303,7 +303,6 @@
attach_signals(PurpleConversation *conv)
{
PidginConversation *gtkconv = NULL;
- PidginWindow *gtkwin = NULL;
GSList *imhtml_ids = NULL, *entry_ids = NULL;
guint id;
@@ -313,8 +312,6 @@
return 0;
}
- gtkwin = gtkconv->win;
-
if (purple_prefs_get_bool("/plugins/gtk/X11/notify/notify_focus")) {
/* TODO should really find a way to make this work no matter
* where the focus is inside the conv window, without having
@@ -358,13 +355,11 @@
detach_signals(PurpleConversation *conv)
{
PidginConversation *gtkconv = NULL;
- PidginWindow *gtkwin = NULL;
GSList *ids = NULL, *l;
gtkconv = PIDGIN_CONVERSATION(conv);
if (!gtkconv)
return;
- gtkwin = gtkconv->win;
ids = purple_conversation_get_data(conv, "notify-imhtml-signals");
for (l = ids; l != NULL; l = l->next)
@@ -650,7 +645,6 @@
apply_method()
{
GList *convs;
- PidginWindow *purplewin = NULL;
for (convs = purple_get_conversations(); convs != NULL;
convs = convs->next) {
@@ -659,7 +653,6 @@
/* remove notifications */
unnotify(conv, FALSE);
- purplewin = PIDGIN_CONVERSATION(conv)->win;
if (GPOINTER_TO_INT(purple_conversation_get_data(conv, "notify-message-count")) != 0)
/* reattach appropriate notifications */
notify(conv, FALSE);
diff -r 581a070c3737 -r 66981e71af29 pidgin/plugins/vvconfig.c
--- a/pidgin/plugins/vvconfig.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/plugins/vvconfig.c Mon Sep 13 09:57:03 2010 +0000
@@ -28,6 +28,9 @@
#include
+/* container window for showing a stand-alone configurator */
+static GtkWidget *window = NULL;
+
static PurpleMediaElementInfo *old_video_src = NULL, *old_video_sink = NULL,
*old_audio_src = NULL, *old_audio_sink = NULL;
@@ -502,6 +505,59 @@
return TRUE;
}
+static void
+config_destroy(GtkObject *w, gpointer nul)
+{
+ purple_debug_info("vvconfig", "closing vv configuration window\n");
+ window = NULL;
+}
+
+static void
+config_close(GtkObject *w, gpointer nul)
+{
+ gtk_widget_destroy(GTK_WIDGET(window));
+}
+
+static void
+show_config(PurplePluginAction *action)
+{
+ if (!window) {
+ GtkWidget *vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+ GtkWidget *hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
+ GtkWidget *config_frame = get_plugin_config_frame(NULL);
+ GtkWidget *close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+
+ gtk_container_add(GTK_CONTAINER(vbox), config_frame);
+ gtk_container_add(GTK_CONTAINER(vbox), hbox);
+ window = pidgin_create_window(_("Voice/Video Settings"),
+ PIDGIN_HIG_BORDER, NULL, TRUE);
+ g_signal_connect(G_OBJECT(window), "destroy",
+ G_CALLBACK(config_destroy), NULL);
+ g_signal_connect(G_OBJECT(close), "clicked",
+ G_CALLBACK(config_close), NULL);
+ gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, PIDGIN_HIG_BORDER);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
+ gtk_widget_show(GTK_WIDGET(close));
+ gtk_widget_show(GTK_WIDGET(vbox));
+ gtk_widget_show(GTK_WIDGET(hbox));
+ }
+ gtk_window_present(GTK_WINDOW(window));
+}
+
+
+static GList *
+actions(PurplePlugin *plugin, gpointer context)
+{
+ GList *l = NULL;
+ PurplePluginAction *act = NULL;
+
+ act = purple_plugin_action_new(_("Voice and Video Settings"),
+ show_config);
+ l = g_list_append(l, act);
+
+ return l;
+}
+
static gboolean
plugin_unload(PurplePlugin *plugin)
{
@@ -525,32 +581,32 @@
static PurplePluginInfo info =
{
- PURPLE_PLUGIN_MAGIC, /**< magic */
- PURPLE_MAJOR_VERSION, /**< major version */
- PURPLE_MINOR_VERSION, /**< minor version */
- PURPLE_PLUGIN_STANDARD, /**< type */
- PIDGIN_PLUGIN_TYPE, /**< ui_requirement */
- 0, /**< flags */
- NULL, /**< dependencies */
- PURPLE_PRIORITY_DEFAULT, /**< priority */
+ PURPLE_PLUGIN_MAGIC, /**< magic */
+ PURPLE_MAJOR_VERSION, /**< major version */
+ PURPLE_MINOR_VERSION, /**< minor version */
+ PURPLE_PLUGIN_STANDARD, /**< type */
+ PIDGIN_PLUGIN_TYPE, /**< ui_requirement */
+ 0, /**< flags */
+ NULL, /**< dependencies */
+ PURPLE_PRIORITY_DEFAULT, /**< priority */
- "gtk-maiku-vvconfig", /**< id */
- N_("Voice/Video Settings"), /**< name */
- DISPLAY_VERSION, /**< version */
- N_("Configure your microphone and webcam."), /**< summary */
+ "gtk-maiku-vvconfig", /**< id */
+ N_("Voice/Video Settings"), /**< name */
+ DISPLAY_VERSION, /**< version */
+ N_("Configure your microphone and webcam."), /**< summary */
N_("Configure microphone and webcam "
- "settings for voice/video calls."), /**< description */
- "Mike Ruprecht ", /**< author */
- PURPLE_WEBSITE, /**< homepage */
+ "settings for voice/video calls."), /**< description */
+ "Mike Ruprecht ", /**< author */
+ PURPLE_WEBSITE, /**< homepage */
- plugin_load, /**< load */
- plugin_unload, /**< unload */
- NULL, /**< destroy */
+ plugin_load, /**< load */
+ plugin_unload, /**< unload */
+ NULL, /**< destroy */
- &ui_info, /**< ui_info */
- NULL, /**< extra_info */
- NULL, /**< prefs_info */
- NULL, /**< actions */
+ &ui_info, /**< ui_info */
+ NULL, /**< extra_info */
+ NULL, /**< prefs_info */
+ actions, /**< actions */
/* padding */
NULL,
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/IdleTracker/Makefile.mingw
--- a/pidgin/win32/IdleTracker/Makefile.mingw Fri Aug 20 08:35:27 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for idletrack
-#
-
-PIDGIN_TREE_TOP := ../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-TARGET = idletrack
-
-##
-## SOURCES, OBJECTS
-##
-
-C_SRC = idletrack.c
-
-OBJECTS = $(C_SRC:%.c=%.o)
-
-include $(PIDGIN_COMMON_RULES)
-
-##
-## TARGET DEFINITIONS
-##
-
-.PHONY: all install clean
-
-all: $(TARGET).dll
-
-install: $(PIDGIN_INSTALL_DIR)
- cp $(TARGET).dll $(PIDGIN_INSTALL_DIR)
-
-##
-## BUILD DLL
-##
-
-$(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
- $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
-
-##
-## CLEAN RULES
-##
-
-clean:
- rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
-
-include $(PIDGIN_COMMON_TARGETS)
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/IdleTracker/idletrack.c
--- a/pidgin/win32/IdleTracker/idletrack.c Fri Aug 20 08:35:27 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-/*
- * idletrack.c
- *
- * Authors: mrgentry @ http://www.experts-exchange.com
- * Herman Bloggs
- * Date: February, 2003
- * Description: Track user inactivity.
- *
- * Andrew Whewell - 25th June 2004. Added
- * support for GetLastInputInfo under Windows 2000 and above. This avoids having
- * IDLETRACK.DLL hook itself into every process on the machine, which makes
- * upgrades easier. The hook mechanism is also used by key loggers, so not
- * using hooks doesn't put the willys up programs that keep an eye out for
- * loggers.
- *
- * Windows 9x doesn't have GetLastInputInfo - when Purple runs on these machines
- * the code silently falls back onto the old hooking scheme.
- */
-#define _WIN32_WINNT 0x0500
-#include "idletrack.h"
-
-#define EXPORT __declspec(dllexport)
-
-static HANDLE hMapObject = NULL;
-static DWORD *lastTime = NULL;
-static HHOOK keyHook = NULL;
-static HHOOK mouseHook = NULL;
-static HINSTANCE g_hInstance = NULL;
-static POINT g_point;
-
-/* GetLastInputInfo address and module - if g_GetLastInputInfo == NULL then
- * we fall back on the old "hook the world" method. GetLastInputInfo was brought
- * in with Windows 2000 so Windows 9x will still hook everything.
- */
-typedef BOOL (WINAPI *GETLASTINPUTINFO)(LASTINPUTINFO *);
-static HMODULE g_user32 = NULL;
-static GETLASTINPUTINFO g_GetLastInputInfo = NULL;
-
-static DWORD* setup_shared_mem() {
- BOOL fInit;
-
- /* Set up the shared memory. */
- hMapObject = CreateFileMapping((HANDLE) 0xFFFFFFFF, /* use paging file */
- NULL, /* no security attributes */
- PAGE_READWRITE, /* read/write access */
- 0, /* size: high 32-bits */
- sizeof(DWORD), /* size: low 32-bits */
- "timermem"); /* name of map object */
-
- if(hMapObject == NULL)
- return NULL;
-
- /* The first process to attach initializes memory. */
- fInit = (GetLastError() != ERROR_ALREADY_EXISTS);
-
- /* Get a pointer to the file-mapped shared memory. */
- lastTime = (DWORD*) MapViewOfFile(hMapObject, /* object to map view of */
- FILE_MAP_WRITE, /* read/write access */
- 0, /* high offset: map from */
- 0, /* low offset: beginning */
- 0); /* default: map entire file */
-
- if(lastTime == NULL)
- return NULL;
-
- *lastTime = GetTickCount();
-
- return lastTime;
-}
-
-
-static LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam) {
- if(!(code < 0)) {
- if(lastTime == NULL)
- lastTime = setup_shared_mem();
-
- if(lastTime)
- *lastTime = GetTickCount();
- }
- return CallNextHookEx(keyHook, code, wParam, lParam);
-}
-
-
-static LRESULT CALLBACK MouseProc(int code, WPARAM wParam, LPARAM lParam) {
- /* We need to verify that the Mouse pointer has actually moved. */
- if(!(code < 0) &&
- !((g_point.x == ((MOUSEHOOKSTRUCT*) lParam)->pt.x) &&
- (g_point.y == ((MOUSEHOOKSTRUCT*) lParam)->pt.y))) {
- g_point.x = ((MOUSEHOOKSTRUCT*) lParam)->pt.x;
- g_point.y = ((MOUSEHOOKSTRUCT*) lParam)->pt.y;
-
- if(lastTime == NULL)
- lastTime = setup_shared_mem();
-
- if(lastTime)
- *lastTime = GetTickCount();
- }
- return CallNextHookEx(mouseHook, code, wParam, lParam);
-}
-
-
-EXPORT DWORD winpidgin_get_lastactive() {
- DWORD result = 0;
-
- /* If we have GetLastInputInfo then use it, otherwise use the hooks*/
- if(g_GetLastInputInfo != NULL) {
- LASTINPUTINFO lii;
- memset(&lii, 0, sizeof(lii));
- lii.cbSize = sizeof(lii);
- if(g_GetLastInputInfo(&lii)) {
- result = lii.dwTime;
- }
- } else {
- if(lastTime == NULL)
- lastTime = setup_shared_mem();
-
- if(lastTime)
- result = *lastTime;
- }
-
- return result;
-}
-
-
-EXPORT BOOL winpidgin_set_idlehooks() {
- /* Is GetLastInputInfo available?*/
- g_user32 = LoadLibrary("user32.dll");
- if(g_user32) {
- g_GetLastInputInfo = (GETLASTINPUTINFO) GetProcAddress(g_user32, "GetLastInputInfo");
- }
-
- /* If we couldn't find GetLastInputInfo then fall back onto the hooking scheme*/
- if(g_GetLastInputInfo == NULL) {
- /* Set up the shared memory.*/
- lastTime = setup_shared_mem();
- if(lastTime == NULL)
- return FALSE;
- *lastTime = GetTickCount();
-
- /* Set up the keyboard hook.*/
- keyHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, g_hInstance, 0);
- if(keyHook == NULL) {
- UnmapViewOfFile(lastTime);
- CloseHandle(hMapObject);
- return FALSE;
- }
-
- /* Set up the mouse hook.*/
- mouseHook = SetWindowsHookEx(WH_MOUSE, MouseProc, g_hInstance, 0);
- if(mouseHook == NULL) {
- UnhookWindowsHookEx(keyHook);
- UnmapViewOfFile(lastTime);
- CloseHandle(hMapObject);
- return FALSE;
- }
- }
-
- return TRUE;
-}
-
-
-EXPORT void winpidgin_remove_idlehooks() {
- if(g_user32 != NULL)
- FreeLibrary(g_user32);
- if(keyHook)
- UnhookWindowsHookEx(keyHook);
- if(mouseHook)
- UnhookWindowsHookEx(mouseHook);
- if(lastTime)
- UnmapViewOfFile(lastTime);
- if(hMapObject)
- CloseHandle(hMapObject);
-}
-
-/* suppress gcc "no previous prototype" warning */
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved);
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) {
- switch(dwReason) {
- case DLL_PROCESS_ATTACH:
- g_hInstance = hInstance;
- g_point.x = 0;
- g_point.y = 0;
- break;
- case DLL_PROCESS_DETACH:
- break;
- }
- return TRUE;
-}
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/IdleTracker/idletrack.h
--- a/pidgin/win32/IdleTracker/idletrack.h Fri Aug 20 08:35:27 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-/*
- * idletrack.h
- */
-#include
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-DWORD winpidgin_get_lastactive(void);
-BOOL winpidgin_set_idlehooks(void);
-void winpidgin_remove_idlehooks(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/win32/gtkwin32dep.c Mon Sep 13 09:57:03 2010 +0000
@@ -43,7 +43,6 @@
#include "network.h"
#include "resource.h"
-#include "idletrack.h"
#include "zlib.h"
#include "untar.h"
@@ -377,15 +376,19 @@
void winpidgin_init(HINSTANCE hint) {
FARPROC proc;
+ gchar *exchndl_dll_path;
purple_debug_info("winpidgin", "winpidgin_init start\n");
exe_hInstance = hint;
- proc = wpurple_find_and_loadproc("exchndl.dll", "SetLogFile");
+ exchndl_dll_path = g_build_filename(wpurple_install_dir(), "exchndl.dll", NULL);
+ proc = wpurple_find_and_loadproc(exchndl_dll_path, "SetLogFile");
+ g_free(exchndl_dll_path);
+ exchndl_dll_path = NULL;
if (proc) {
gchar *debug_dir, *locale_debug_dir;
-
+
debug_dir = g_build_filename(purple_user_dir(), "pidgin.RPT", NULL);
locale_debug_dir = g_locale_from_utf8(debug_dir, -1, NULL, NULL, NULL);
@@ -397,10 +400,6 @@
g_free(locale_debug_dir);
}
- /* IdleTracker Initialization */
- if(!winpidgin_set_idlehooks())
- purple_debug_error("winpidgin", "Failed to initialize idle tracker\n");
-
winpidgin_spell_init();
purple_debug_info("winpidgin", "GTK+ :%u.%u.%u\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
@@ -429,9 +428,6 @@
if(messagewin_hwnd)
DestroyWindow(messagewin_hwnd);
- /* Idle tracker cleanup */
- winpidgin_remove_idlehooks();
-
}
/* DLL initializer */
@@ -535,5 +531,18 @@
(winR.right - winR.left),
(winR.bottom - winR.top), TRUE);
}
+
}
+DWORD winpidgin_get_lastactive() {
+ DWORD result = 0;
+
+ LASTINPUTINFO lii;
+ memset(&lii, 0, sizeof(lii));
+ lii.cbSize = sizeof(lii);
+ if (GetLastInputInfo(&lii))
+ result = lii.dwTime;
+
+ return result;
+}
+
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/gtkwin32dep.h
--- a/pidgin/win32/gtkwin32dep.h Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/win32/gtkwin32dep.h Mon Sep 13 09:57:03 2010 +0000
@@ -39,6 +39,7 @@
void winpidgin_ensure_onscreen(GtkWidget *win);
void winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags);
void winpidgin_window_flash(GtkWindow *window, gboolean flash);
+DWORD winpidgin_get_lastactive(void);
/* init / cleanup */
void winpidgin_init(HINSTANCE);
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi Mon Sep 13 09:57:03 2010 +0000
@@ -268,7 +268,7 @@
DetailPrint "Downloading GTK+ Runtime ... ($R2)"
NSISdl::download /TIMEOUT=10000 $R2 $R1
Pop $R0
- StrCmp $R0 "cancel" done
+ ;StrCmp $R0 "cancel" done
StrCmp $R0 "success" +2
MessageBox MB_RETRYCANCEL "$(PIDGINGTKDOWNLOADERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done
@@ -304,6 +304,7 @@
WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$INSTDIR\Gtk\bin"
WriteRegStr HKLM ${PIDGIN_REG_KEY} "" "$INSTDIR"
WriteRegStr HKLM ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+ WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\pidgin.exe"
WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
@@ -317,6 +318,7 @@
pidgin_hkcu:
WriteRegStr HKCU ${PIDGIN_REG_KEY} "" "$INSTDIR"
WriteRegStr HKCU ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+ WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\pidgin.exe"
WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
@@ -619,7 +621,6 @@
RMDir "$INSTDIR\spellcheck\lib"
RMDir "$INSTDIR\spellcheck"
Delete "$INSTDIR\freebl3.dll"
- Delete "$INSTDIR\idletrack.dll"
Delete "$INSTDIR\libjabber.dll"
Delete "$INSTDIR\libnspr4.dll"
Delete "$INSTDIR\libmeanwhile-1.dll"
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/winpidgin.c
--- a/pidgin/win32/winpidgin.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/win32/winpidgin.c Mon Sep 13 09:57:03 2010 +0000
@@ -605,9 +605,9 @@
char *lpszCmdLine, int nCmdShow) {
wchar_t errbuf[512];
wchar_t pidgin_dir[MAX_PATH];
+ wchar_t *pidgin_dir_start = NULL;
wchar_t exe_name[MAX_PATH];
HMODULE hmod;
- wchar_t *tmp;
wchar_t *wtmp;
int pidgin_argc;
char **pidgin_argv; /* This is in utf-8 */
@@ -672,14 +672,14 @@
if (GetModuleFileNameW(NULL, pidgin_dir, MAX_PATH) != 0) {
/* primitive dirname() */
- tmp = wcsrchr(pidgin_dir, L'\\');
+ pidgin_dir_start = wcsrchr(pidgin_dir, L'\\');
- if (tmp) {
+ if (pidgin_dir_start) {
HMODULE hmod;
- tmp[0] = L'\0';
+ pidgin_dir_start[0] = L'\0';
/* tmp++ will now point to the executable file name */
- wcscpy(exe_name, tmp + 1);
+ wcscpy(exe_name, pidgin_dir_start + 1);
wcscat(pidgin_dir, L"\\exchndl.dll");
if ((hmod = LoadLibraryW(pidgin_dir))) {
@@ -702,7 +702,8 @@
proc = GetProcAddress(hmod, "SetDebugInfoDir");
if (proc) {
char *pidgin_dir_ansi = NULL;
- tmp[0] = L'\0';
+ /* Restore pidgin_dir to point to where the executable is */
+ pidgin_dir_start[0] = L'\0';
i = WideCharToMultiByte(CP_ACP, 0, pidgin_dir,
-1, NULL, 0, NULL, NULL);
if (i != 0) {
@@ -728,7 +729,8 @@
}
- tmp[0] = L'\0';
+ /* Restore pidgin_dir to point to where the executable is */
+ pidgin_dir_start[0] = L'\0';
}
} else {
DWORD dw = GetLastError();
@@ -763,9 +765,14 @@
return 0;
/* Now we are ready for Pidgin .. */
- if ((hmod = LoadLibraryW(L"pidgin.dll")))
+ wcscat(pidgin_dir, L"\\pidgin.dll");
+ if ((hmod = LoadLibraryW(pidgin_dir)))
pidgin_main = (LPFNPIDGINMAIN) GetProcAddress(hmod, "pidgin_main");
+ /* Restore pidgin_dir to point to where the executable is */
+ if (pidgin_dir_start)
+ pidgin_dir_start[0] = L'\0';
+
if (!pidgin_main) {
DWORD dw = GetLastError();
BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND);
diff -r 581a070c3737 -r 66981e71af29 pidgin/win32/wspell.c
--- a/pidgin/win32/wspell.c Fri Aug 20 08:35:27 2010 +0000
+++ b/pidgin/win32/wspell.c Mon Sep 13 09:57:03 2010 +0000
@@ -73,25 +73,29 @@
static void load_gtkspell() {
UINT old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
gchar *tmp, *tmp2;
+
const char *path = g_getenv("PATH");
tmp = g_build_filename(wpurple_install_dir(), "spellcheck", NULL);
- tmp2 = g_strdup_printf("%s%s%s", (path ? path : ""),
+ tmp2 = g_strdup_printf("%s%s%s", tmp,
(path ? G_SEARCHPATH_SEPARATOR_S : ""),
- tmp);
+ (path ? path : ""));
g_free(tmp);
g_setenv("PATH", tmp2, TRUE);
+ g_free(tmp2);
+ tmp = g_build_filename(wpurple_install_dir(), "spellcheck", GTKSPELL_DLL, NULL);
/* Suppress error popups */
- wpidginspell_new_attach_proxy = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_new_attach" );
+ wpidginspell_new_attach_proxy = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_new_attach" );
if (wpidginspell_new_attach_proxy) {
- wpidginspell_get_from_text_view = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_get_from_text_view");
- wpidginspell_detach = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_detach");
- wpidginspell_set_language = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_set_language");
- wpidginspell_recheck_all = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_recheck_all");
+ wpidginspell_get_from_text_view = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_get_from_text_view");
+ wpidginspell_detach = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_detach");
+ wpidginspell_set_language = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_set_language");
+ wpidginspell_recheck_all = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_recheck_all");
} else {
- purple_debug_warning("wspell", "Couldn't load gtkspell (%s) \n", GTKSPELL_DLL);
+ purple_debug_warning("wspell", "Couldn't load gtkspell (%s) \n", tmp);
/*wpidginspell_new_attach = wgtkspell_new_attach;*/
}
+ g_free(tmp);
SetErrorMode(old_error_mode);
}
diff -r 581a070c3737 -r 66981e71af29 po/af.po
--- a/po/af.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/af.po Mon Sep 13 09:57:03 2010 +0000
@@ -802,7 +802,7 @@
msgid "Waiting for transfer to begin"
msgstr "Wag vir oordrag om te begin"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Gekanselleer"
msgid "Failed"
@@ -15698,15 +15698,6 @@
#~ "afkomstig te wees. Dit kan beteken dat u nie tans aan die diens gekoppel "
#~ "is wat u dink nie."
-#~ msgid "You canceled the transfer of %s"
-#~ msgstr "U het die oordrag van %s gekanselleer"
-
-#~ msgid "%s canceled the transfer of %s"
-#~ msgstr "%s het die oordrag van %s gekanselleer"
-
-#~ msgid "%s canceled the file transfer"
-#~ msgstr "%s het die lêeroordrag gekanselleer"
-
#~ msgid "Join/Part Hiding Configuration"
#~ msgstr "Opstelling vir in- en uitgaanversteking"
@@ -16292,7 +16283,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Kon nie %s vir skryf open nie!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/am.po
--- a/po/am.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/am.po Mon Sep 13 09:57:03 2010 +0000
@@ -812,7 +812,7 @@
msgstr ""
#, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
msgstr "ተወው"
#, fuzzy
diff -r 581a070c3737 -r 66981e71af29 po/ar.po
--- a/po/ar.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ar.po Mon Sep 13 09:57:03 2010 +0000
@@ -791,7 +791,7 @@
msgid "Waiting for transfer to begin"
msgstr "في انتظار بدء النقل"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "أُلغِيَ"
msgid "Failed"
@@ -16584,7 +16584,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "لايمكن فتح %s للكتابة!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "فشل ارسال الملف: من المحتمل أن المستقبِل ألغى العملية."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/as.po
--- a/po/as.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/as.po Mon Sep 13 09:57:03 2010 +0000
@@ -789,7 +789,7 @@
msgid "Waiting for transfer to begin"
msgstr "বিনিময়ৰ আৰম্ভত অপেক্ষা কৰা হৈছে"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "বাতিল কৰা হৈছে"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/az.po
--- a/po/az.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/az.po Mon Sep 13 09:57:03 2010 +0000
@@ -809,7 +809,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr ""
msgid "Failed"
@@ -16008,7 +16008,7 @@
#~ msgid "Invalid Groupname"
#~ msgstr "Səhv istifadəçi adı."
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Fayl transferi bacarılmadı, güman ki digər tərəfdən ləğv edildi."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/be@latin.po
--- a/po/be@latin.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/be@latin.po Mon Sep 13 09:57:03 2010 +0000
@@ -801,7 +801,7 @@
msgid "Waiting for transfer to begin"
msgstr "Čakańnie pačatku pieradačy"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Anulavanaja"
msgid "Failed"
@@ -16704,7 +16704,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Niemahčyma adčynić %s dziela zapisu!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Pamyłka pieradačy fajłu; aperacyja, mabyć, anulavanaja z taho boku."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/bg.po
--- a/po/bg.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/bg.po Mon Sep 13 09:57:03 2010 +0000
@@ -820,7 +820,7 @@
msgid "Waiting for transfer to begin"
msgstr "Изчакване пренасянето да започне"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Отказан"
msgid "Failed"
@@ -16574,7 +16574,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "%s не може да бъде отворен за запис!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Неуспешен пренос на файла. Получателят вероятно е отказал получаването."
diff -r 581a070c3737 -r 66981e71af29 po/bn.po
--- a/po/bn.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/bn.po Mon Sep 13 09:57:03 2010 +0000
@@ -843,7 +843,7 @@
msgid "Waiting for transfer to begin"
msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করা হচ্ছে"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "বাতিল করা হয়েছে"
# mark6
diff -r 581a070c3737 -r 66981e71af29 po/bn_IN.po
--- a/po/bn_IN.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/bn_IN.po Mon Sep 13 09:57:03 2010 +0000
@@ -795,7 +795,7 @@
msgid "Waiting for transfer to begin"
msgstr "পরিবহণ আরম্ভে অপেক্ষা চলছে"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "বাতিল করা হয়েছে"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/bs.po
--- a/po/bs.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/bs.po Mon Sep 13 09:57:03 2010 +0000
@@ -822,7 +822,7 @@
msgid "Waiting for transfer to begin"
msgstr "Cekanje na pocetak transfera"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Otkazano"
msgid "Failed"
@@ -17049,7 +17049,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Nije bilo moguce otvoriti %s za pisanje!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Transfer datoteke je neuspio; druga strana je vjerovatno odustala."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/ca.po
--- a/po/ca.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ca.po Mon Sep 13 09:57:03 2010 +0000
@@ -834,7 +834,7 @@
msgid "Waiting for transfer to begin"
msgstr "S'està esperant a iniciar la transferència"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "S'ha cancel·lat"
msgid "Failed"
@@ -16326,7 +16326,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
#~ "l'altra banda."
diff -r 581a070c3737 -r 66981e71af29 po/ca@valencia.po
--- a/po/ca@valencia.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ca@valencia.po Mon Sep 13 09:57:03 2010 +0000
@@ -834,7 +834,7 @@
msgid "Waiting for transfer to begin"
msgstr "S'està esperant a iniciar la transferència"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "S'ha cancel·lat"
msgid "Failed"
@@ -16324,7 +16324,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
#~ "l'altra banda."
diff -r 581a070c3737 -r 66981e71af29 po/cs.po
--- a/po/cs.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/cs.po Mon Sep 13 09:57:03 2010 +0000
@@ -793,7 +793,7 @@
msgid "Waiting for transfer to begin"
msgstr "Čekám na začátek přenosu"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Zrušeno"
msgid "Failed"
@@ -16042,7 +16042,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Nemohu otevřít %s pro zápis!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/da.po
--- a/po/da.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/da.po Mon Sep 13 09:57:03 2010 +0000
@@ -812,7 +812,7 @@
msgid "Waiting for transfer to begin"
msgstr "Venter på at overførsel skal starte"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Annulleret"
msgid "Failed"
@@ -16489,7 +16489,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Kunne ikke åbne %s til skrivning!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Filoverførsel fejlede - den anden side har sikkert afbrudt."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/de.po
--- a/po/de.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/de.po Mon Sep 13 09:57:03 2010 +0000
@@ -11,9 +11,9 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-01 00:18+0200\n"
-"PO-Revision-Date: 2010-08-01 00:16+0200\n"
-"Last-Translator: Jochen Kemnade \n"
+"POT-Creation-Date: 2010-09-02 19:45+0200\n"
+"PO-Revision-Date: 2010-09-06 10:01+0200\n"
+"Last-Translator: Björn Voigt \n"
"Language-Team: Deutsch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -813,7 +813,7 @@
msgid "Waiting for transfer to begin"
msgstr "Warte auf den Beginn der Dateiübertragung"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Abgebrochen"
msgid "Failed"
@@ -4772,11 +4772,17 @@
msgid "Domain"
msgstr "Domain"
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS voraussetzen"
-
-msgid "Force old (port 5223) SSL"
-msgstr "Erzwinge altes SSL (Port 5223)"
+msgid "Require encryption"
+msgstr "Verschlüsselung fordern"
+
+msgid "Use encryption if available"
+msgstr "Verschlüsselung benutzen, wenn verfügbar"
+
+msgid "Use old-style SSL"
+msgstr "Alte SSL-Methode verwenden"
+
+msgid "Connection security"
+msgstr "Verbindungssicherheit"
msgid "Allow plaintext auth over unencrypted streams"
msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
@@ -7218,96 +7224,6 @@
msgid "File %s is %s, which is larger than the maximum size of %s."
msgstr "Datei %s (%s) ist größer als die maximale Größe von %s."
-msgid ""
-"(There was an error receiving this message. The buddy you are speaking with "
-"is probably using a different encoding than expected. If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(Es gab einen Fehler beim Empfangen dieser Nachricht. Der Buddy, mit dem "
-"Sie sich unterhalten benutzt wahrscheinlich eine andere Kodierung als "
-"erwartet. Wenn Sie wissen, welche Kodierung er benutzt, können Sie diese in "
-"den erweiterten Konto-Optionen Ihres AIM/ICQ-Kontos angeben.)"
-
-#, c-format
-msgid ""
-"(There was an error receiving this message. Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(Es gab einen Fehler beim Empfang dieser Nachricht. Entweder haben Sie und %"
-"s unterschiedliche Kodierungen gesetzt oder %s hat einen fehlerhaften "
-"Client.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy-Icon"
-
-msgid "Voice"
-msgstr "Stimme"
-
-msgid "AIM Direct IM"
-msgstr "AIM direkte Nachricht"
-
-msgid "Get File"
-msgstr "Datei abrufen"
-
-msgid "Games"
-msgstr "Spiele"
-
-msgid "ICQ Xtraz"
-msgstr "ICQ Xtraz"
-
-msgid "Add-Ins"
-msgstr "Zusätze"
-
-msgid "Send Buddy List"
-msgstr "Buddy-Liste senden"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ direkte Verbindung"
-
-msgid "AP User"
-msgstr "AP Benutzer"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Altes ICQ UTF-8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian-Verschlüsselung"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF-8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sicherheit aktiviert"
-
-msgid "Video Chat"
-msgstr "Video-Chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live-Video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Gemeinsamer Bildschirm"
-
msgid "Free For Chat"
msgstr "Bereit zum Chatten"
@@ -7338,15 +7254,6 @@
msgid "At lunch"
msgstr "Zur Mittagspause"
-msgid "IP Address"
-msgstr "IP-Adresse"
-
-msgid "Warning Level"
-msgstr "Warnstufe"
-
-msgid "Buddy Comment"
-msgstr "Buddy-Kommentar"
-
#, c-format
msgid "Unable to connect to authentication server: %s"
msgstr "Verbindung zum Authentifizierungsserver nicht möglich: %s"
@@ -7446,17 +7353,6 @@
msgid "Unable to initialize connection"
msgstr "Kann Verbindung nicht erstellen"
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
-"kann."
-
-msgid "No reason given."
-msgstr "Kein Grund angegeben."
-
-msgid "Authorization Denied Message:"
-msgstr "Nachricht für die Ablehnung der Autorisierung:"
-
#, c-format
msgid ""
"The user %u has denied your request to add them to your buddy list for the "
@@ -7467,6 +7363,9 @@
"Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
"%s"
+msgid "No reason given."
+msgstr "Kein Grund angegeben."
+
msgid "ICQ authorization denied."
msgstr "ICQ-Autorisierung verweigert."
@@ -7582,60 +7481,13 @@
msgstr[1] ""
"Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
-#, c-format
-msgid "User information not available: %s"
-msgstr "Benutzerinformation nicht verfügbar: %s"
-
-msgid "Online Since"
-msgstr "Online seit"
-
-msgid "Member Since"
-msgstr "Mitglied seit"
-
-msgid "Capabilities"
-msgstr "Fähigkeiten"
-
msgid "Your AIM connection may be lost."
msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
-"Zeichen enthält.]"
-
#, c-format
msgid "You have been disconnected from chat room %s."
msgstr "Die Verbindung zum Raum %s wurde unterbrochen."
-msgid "Mobile Phone"
-msgstr "Handynummer"
-
-msgid "Personal Web Page"
-msgstr "Persönliche Webseite"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Zusätzliche Informationen"
-
-msgid "Zip Code"
-msgstr "PLZ"
-
-msgid "Work Information"
-msgstr "Information (Arbeit)"
-
-msgid "Division"
-msgstr "Abteilung"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Webseite"
-
msgid "Pop-Up Message"
msgstr "Pop-Up Nachricht"
@@ -7922,8 +7774,8 @@
msgid "Change Address To:"
msgstr "Ändere die Adresse zu:"
-msgid "you are not waiting for authorization"
-msgstr "Sie warten derzeit auf keine Autorisierungen"
+msgid "you are not waiting for authorization"
+msgstr "Sie warten derzeit auf keine Autorisierungen"
msgid "You are awaiting authorization from the following buddies"
msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
@@ -7978,9 +7830,6 @@
msgid "Search for Buddy by Email Address..."
msgstr "Suche Buddys nach E-Mail-Adresse..."
-msgid "Search for Buddy by Information"
-msgstr "Suche Buddy nach Information"
-
msgid "Use clientLogin"
msgstr "clientLogin benutzen"
@@ -8268,8 +8117,8 @@
msgstr "Ihre Anfrage wurde abgelehnt."
#, c-format
-msgid "%u requires verification"
-msgstr "%u erfordert Autorisierung"
+msgid "%u requires verification: %s"
+msgstr "%u erfordert Überprüfung: %s"
msgid "Add buddy question"
msgstr "Buddy-Frage hinzufügen"
@@ -10146,6 +9995,9 @@
msgid "Computer"
msgstr "Computer"
+msgid "Mobile Phone"
+msgstr "Handynummer"
+
msgid "PDA"
msgstr "PDA"
@@ -10580,6 +10432,9 @@
msgid "Write Error"
msgstr "Schreibfehler"
+msgid "IP Address"
+msgstr "IP-Adresse"
+
msgid "Yahoo! Japan Profile"
msgstr "Yahoo!-Japan-Profil"
@@ -10621,6 +10476,9 @@
msgid "Cool Link 3"
msgstr "Cooler Link 3"
+msgid "Member Since"
+msgstr "Mitglied seit"
+
msgid "Last Update"
msgstr "Letzte Aktualisierung"
@@ -11247,6 +11105,11 @@
"Listenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
"bearbeiten oder löschen"
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s möchte Sie (%s) zu seiner oder ihrer Buddy-Liste hinzufügen%s%s"
+
#. Buddy List
msgid "Background Color"
msgstr "Hintergrundfarbe"
@@ -11506,6 +11369,8 @@
msgid "Edit User Mood"
msgstr "Benutzerstimmung ändern"
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
#. Buddies menu
msgid "/_Buddies"
msgstr "/_Buddys"
@@ -13648,6 +13513,9 @@
msgid "_TURN server:"
msgstr "_TURN-Server:"
+msgid "_UDP Port:"
+msgstr "_UDP-Port:"
+
msgid "Use_rname:"
msgstr "_Benutzername:"
@@ -14143,6 +14011,10 @@
"Dateigröße: %s\n"
"Bildgröße: %dx%d"
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy-Icon"
+
#, c-format
msgid "The file '%s' is too large for %s. Please try a smaller image.\n"
msgstr ""
@@ -14228,7 +14100,7 @@
msgid "Small"
msgstr "Klein"
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
msgstr "Kleinere Versionen der Default-Smileys"
msgid "Response Probability:"
@@ -15079,6 +14951,9 @@
msgid "Half Operator"
msgstr "Half-Operator"
+msgid "Voice"
+msgstr "Stimme"
+
msgid "Authorization dialog"
msgstr "Autorisierungsdialog"
@@ -15268,6 +15143,9 @@
msgid "Voice/Video Settings"
msgstr "Sprach-/Video-Einstellungen"
+msgid "Voice and Video Settings"
+msgstr "Sprach- und Video-Einstellungen"
+
#. *< name
#. *< version
msgid "Configure your microphone and webcam."
@@ -15397,7 +15275,7 @@
msgstr ""
"Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0). $_CLICK will become a translated version of "Click Next to continue."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0). $_CLICK will become a translated version of "Click Next to continue." DO NOT translate the CLICK in $_CLICK. It will break the installer.
msgid ""
"$(^Name) is released under the GNU General Public License (GPL). The license "
"is provided here for information purposes only. $_CLICK"
diff -r 581a070c3737 -r 66981e71af29 po/dz.po
--- a/po/dz.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/dz.po Mon Sep 13 09:57:03 2010 +0000
@@ -818,7 +818,7 @@
msgid "Waiting for transfer to begin"
msgstr "གནས་སོར་འགོ་བཙུགས་ནིའི་དོན་ལུ་བསྒུག་དོ།"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "ཆ་མེད་བཏང་ཡི།"
msgid "Failed"
@@ -16889,7 +16889,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "བྲིས་ནིའི་དོན་ལུ %s ཁ་ཕྱེ་མ་ཚུགས།"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ནུག ཕྱོགས་གཞན་མི་འདི་ཆ་མེད་བཏང་ཡི།"
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/el.po
--- a/po/el.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/el.po Mon Sep 13 09:57:03 2010 +0000
@@ -804,7 +804,7 @@
msgid "Waiting for transfer to begin"
msgstr "Αναμονή έναρξης μεταφοράς"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Ακυρώθηκε"
msgid "Failed"
@@ -16284,7 +16284,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά."
diff -r 581a070c3737 -r 66981e71af29 po/en_AU.po
--- a/po/en_AU.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/en_AU.po Mon Sep 13 09:57:03 2010 +0000
@@ -834,8 +834,8 @@
msgid "Waiting for transfer to begin"
msgstr "Waiting for transfer to begin"
-msgid "Canceled"
-msgstr "Canceled"
+msgid "Cancelled"
+msgstr "Cancelled"
msgid "Failed"
msgstr "Failed"
@@ -2128,14 +2128,14 @@
#, fuzzy, c-format
msgid "You cancelled the transfer of %s"
-msgstr "You canceled the transfer of %s"
+msgstr "You cancelled the transfer of %s"
msgid "File transfer cancelled"
msgstr "File transfer cancelled"
#, fuzzy, c-format
msgid "%s cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
#, fuzzy, c-format
msgid "%s cancelled the file transfer"
@@ -9265,7 +9265,7 @@
#, fuzzy, c-format
msgid "%d cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
#, fuzzy, c-format
msgid "Group Title: %s
"
@@ -9346,7 +9346,7 @@
#, fuzzy
msgid "Place Closed"
-msgstr "Canceled"
+msgstr "Cancelled"
msgid "Microphone"
msgstr ""
@@ -17062,8 +17062,8 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Could not open %s for writing!"
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
+#~ msgstr "File transfer failed; other side probably cancelled."
#~ msgid "Could not connect for transfer."
#~ msgstr "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/en_CA.po
--- a/po/en_CA.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/en_CA.po Mon Sep 13 09:57:03 2010 +0000
@@ -834,7 +834,7 @@
msgid "Waiting for transfer to begin"
msgstr "Waiting for transfer to begin"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelled"
msgid "Failed"
@@ -17050,7 +17050,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Could not open %s for writing!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "File transfer failed; other side probably cancelled."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/en_GB.po
--- a/po/en_GB.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/en_GB.po Mon Sep 13 09:57:03 2010 +0000
@@ -793,7 +793,7 @@
msgid "Waiting for transfer to begin"
msgstr "Waiting for transfer to begin"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelled"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/eo.po
--- a/po/eo.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/eo.po Mon Sep 13 09:57:03 2010 +0000
@@ -766,7 +766,7 @@
msgid "Waiting for transfer to begin"
msgstr "Atendante la alŝutoeko"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Rezignita"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/es.po
--- a/po/es.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/es.po Mon Sep 13 09:57:03 2010 +0000
@@ -916,7 +916,7 @@
msgid "Waiting for transfer to begin"
msgstr "Esperando el comienzo de la transferencia"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelado"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/et.po
--- a/po/et.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/et.po Mon Sep 13 09:57:03 2010 +0000
@@ -795,7 +795,7 @@
msgid "Waiting for transfer to begin"
msgstr "Oodatakse ülekande algust"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Tühistatud"
msgid "Failed"
@@ -16081,7 +16081,7 @@
#~ msgid "Password Change Successful"
#~ msgstr "Paroolimuutmine õnnestus"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/eu.po
--- a/po/eu.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/eu.po Mon Sep 13 09:57:03 2010 +0000
@@ -801,7 +801,7 @@
msgid "Waiting for transfer to begin"
msgstr "Transferentzia hasteko zain"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Bertan behera utzi da"
msgid "Failed"
@@ -16340,7 +16340,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Ezin izan da %s ireki idazteko!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Fitxategi-transferentziak huts egin du; beste aldekoak beharbada bertan "
#~ "behera utziko zuen."
diff -r 581a070c3737 -r 66981e71af29 po/fa.po
--- a/po/fa.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/fa.po Mon Sep 13 09:57:03 2010 +0000
@@ -808,7 +808,7 @@
msgid "Waiting for transfer to begin"
msgstr "در حال انتظار برای آغاز انتقال"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "صرف نظر شد"
msgid "Failed"
@@ -16683,7 +16683,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "نمیتوان %s را برای نوشتن باز کرد!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "انتقال پرونده شکست خورد؛ احتمالاً طرف دیگر انصراف داده است."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/fi.po
--- a/po/fi.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/fi.po Mon Sep 13 09:57:03 2010 +0000
@@ -802,7 +802,7 @@
msgid "Waiting for transfer to begin"
msgstr "Odotetaan lähetyksen alkamista"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Peruutettu"
msgid "Failed"
@@ -16262,7 +16262,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
@@ -17459,7 +17459,7 @@
#~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
#~ msgstr "Pyyntösi lähettää tiedosto (%s) one evätty tuttavan (%d) toimesta"
-#~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
+#~ msgid "The sending process of file[%s] has been cancelled by buddy[%d]"
#~ msgstr "Tiedoston (%s) lähetys on peruutettu tuttavan (%d) toimesta"
#~ msgid "Blink tray icon for unread..."
diff -r 581a070c3737 -r 66981e71af29 po/fr.po
--- a/po/fr.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/fr.po Mon Sep 13 09:57:03 2010 +0000
@@ -821,7 +821,7 @@
msgid "Waiting for transfer to begin"
msgstr "En attente de début de transfert"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Annulé"
msgid "Failed"
@@ -16009,7 +16009,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Impossible d'ouvrir %s pour l'écriture"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Échec du transfert de fichier. Annulation probable du correspondant."
diff -r 581a070c3737 -r 66981e71af29 po/ga.po
--- a/po/ga.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ga.po Mon Sep 13 09:57:03 2010 +0000
@@ -750,7 +750,7 @@
msgstr ""
#, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cealaithe"
#, fuzzy
diff -r 581a070c3737 -r 66981e71af29 po/gl.po
--- a/po/gl.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/gl.po Mon Sep 13 09:57:03 2010 +0000
@@ -807,7 +807,7 @@
msgid "Waiting for transfer to begin"
msgstr "Agardando o comezo da transferencia"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelado"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/gu.po
--- a/po/gu.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/gu.po Mon Sep 13 09:57:03 2010 +0000
@@ -789,7 +789,7 @@
msgid "Waiting for transfer to begin"
msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "રદ થયેલ"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/he.po
--- a/po/he.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/he.po Mon Sep 13 09:57:03 2010 +0000
@@ -781,7 +781,7 @@
msgid "Waiting for transfer to begin"
msgstr "ממתין להעברה להתחיל"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "בוטל"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/hi.po
--- a/po/hi.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/hi.po Mon Sep 13 09:57:03 2010 +0000
@@ -780,7 +780,7 @@
msgid "Waiting for transfer to begin"
msgstr "हस्तांतरण के शुरु होने की प्रतीक्षा करता है."
-msgid "Canceled"
+msgid "Cancelled"
msgstr "रद्द"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/hu.po
--- a/po/hu.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/hu.po Mon Sep 13 09:57:03 2010 +0000
@@ -804,7 +804,7 @@
msgid "Waiting for transfer to begin"
msgstr "Várakozás az átvitel indulására"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Megszakítva"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/hy.po
--- a/po/hy.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/hy.po Mon Sep 13 09:57:03 2010 +0000
@@ -755,7 +755,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr ""
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/id.po
--- a/po/id.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/id.po Mon Sep 13 09:57:03 2010 +0000
@@ -815,7 +815,7 @@
msgid "Waiting for transfer to begin"
msgstr "Menunggu transfer untuk mulai"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Dibatalkan"
msgid "Failed"
@@ -16769,7 +16769,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "%s tidak dapat dibuka untuk penulisan!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Transfer file gagal; sisi lainnya kemungkinan membatalkan."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/it.po
--- a/po/it.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/it.po Mon Sep 13 09:57:03 2010 +0000
@@ -808,7 +808,7 @@
msgid "Waiting for transfer to begin"
msgstr "In attesa dell'inizio del trasferimento"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Annullato"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/ja.po
--- a/po/ja.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ja.po Mon Sep 13 09:57:03 2010 +0000
@@ -808,7 +808,7 @@
msgid "Waiting for transfer to begin"
msgstr "転送開始を待っています"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "キャンセルしました"
msgid "Failed"
@@ -16759,7 +16759,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "書き込みモードで %s を開けません！"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。"
diff -r 581a070c3737 -r 66981e71af29 po/ka.po
--- a/po/ka.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ka.po Mon Sep 13 09:57:03 2010 +0000
@@ -807,7 +807,7 @@
msgid "Waiting for transfer to begin"
msgstr "ველოდები გადატანის დაწყებას"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "გაუქმებულია"
#, fuzzy
diff -r 581a070c3737 -r 66981e71af29 po/km.po
--- a/po/km.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/km.po Mon Sep 13 09:57:03 2010 +0000
@@ -777,7 +777,7 @@
msgid "Waiting for transfer to begin"
msgstr "រង់ចាំការផ្ទេរចាប់ផ្ដើម"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "បានបោះបង់"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/kn.po
--- a/po/kn.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/kn.po Mon Sep 13 09:57:03 2010 +0000
@@ -802,7 +802,7 @@
msgid "Waiting for transfer to begin"
msgstr "ವರ್ಗಾವಣೆಯ ಪ್ರಾರಂಭಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "ರದ್ದಾಗಿದೆ"
msgid "Failed"
@@ -15930,7 +15930,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ ; ಬಹುಶ: ಆಚೆಯವರು ರದ್ದು ಮಾಡಿದರು"
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/ko.po
--- a/po/ko.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ko.po Mon Sep 13 09:57:03 2010 +0000
@@ -816,7 +816,7 @@
msgid "Waiting for transfer to begin"
msgstr "전송 시작을 기다리고 있습니다."
-msgid "Canceled"
+msgid "Cancelled"
msgstr "취소되었습니다."
msgid "Failed"
@@ -16691,7 +16691,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "파일 전송에 실패했습니다. 아마도 상대측에서 취소한 것 같습니다."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/ku.po
--- a/po/ku.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ku.po Mon Sep 13 09:57:03 2010 +0000
@@ -828,7 +828,7 @@
msgid "Waiting for transfer to begin"
msgstr "Li benda destpêkirina transferê ye"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Hate Betalkirin"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/lo.po
--- a/po/lo.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/lo.po Mon Sep 13 09:57:03 2010 +0000
@@ -744,7 +744,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr ""
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/lt.po
--- a/po/lt.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/lt.po Mon Sep 13 09:57:03 2010 +0000
@@ -826,7 +826,7 @@
msgid "Waiting for transfer to begin"
msgstr "Laukiama perdavimo pradžios"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Atšaukta"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/mk.po
--- a/po/mk.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/mk.po Mon Sep 13 09:57:03 2010 +0000
@@ -806,7 +806,7 @@
msgid "Waiting for transfer to begin"
msgstr "Чекам да започне преносот"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Откажано"
msgid "Failed"
@@ -16667,7 +16667,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Не можам да ја отворам %s за запишување!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Размената на датотека не успеа. Другата страна веројатно откажа."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/ml.po
--- a/po/ml.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ml.po Mon Sep 13 09:57:03 2010 +0000
@@ -788,7 +788,7 @@
msgid "Waiting for transfer to begin"
msgstr "ഇടപാടു് ആരംഭിക്കുന്നതിനായി കാത്തിരിക്കുന്നു"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "റദ്ദാക്കിയിരിക്കുന്നു"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/mn.po
--- a/po/mn.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/mn.po Mon Sep 13 09:57:03 2010 +0000
@@ -774,7 +774,7 @@
msgid "Waiting for transfer to begin"
msgstr "Файл шилжүүлэлт эхлүүлэхийг хүлээж байна"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Цуцлагдсан"
msgid "Failed"
@@ -15602,7 +15602,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Завсар хийхээр %sийг нээж чадсангүй!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Файл дамжуулалт амжилттгүй боллоо."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/mr.po
--- a/po/mr.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/mr.po Mon Sep 13 09:57:03 2010 +0000
@@ -779,7 +779,7 @@
msgid "Waiting for transfer to begin"
msgstr "स्थानांतर सुरू करण्याची प्रतिक्षा करत आहे"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "रद्द केले"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/ms_MY.po
--- a/po/ms_MY.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ms_MY.po Mon Sep 13 09:57:03 2010 +0000
@@ -741,7 +741,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr ""
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/my_MM.po
--- a/po/my_MM.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/my_MM.po Mon Sep 13 09:57:03 2010 +0000
@@ -834,7 +834,7 @@
msgid "Waiting for transfer to begin"
msgstr "Waiting for transfer to begin"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelled"
msgid "Failed"
@@ -17057,7 +17057,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Could not open %s for writing!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "File transfer failed; other side probably cancelled."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/nb.po
--- a/po/nb.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/nb.po Mon Sep 13 09:57:03 2010 +0000
@@ -803,7 +803,7 @@
msgid "Waiting for transfer to begin"
msgstr "Venter på at overføringen skal starte"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Avbrutt"
msgid "Failed"
@@ -16208,7 +16208,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Klarte ikke åpne %s for skriving!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
diff -r 581a070c3737 -r 66981e71af29 po/ne.po
--- a/po/ne.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ne.po Mon Sep 13 09:57:03 2010 +0000
@@ -824,7 +824,7 @@
msgid "Waiting for transfer to begin"
msgstr "स्थानान्तरण सुरू गर्नकोलागि पर्खिरहेको"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "रद्द गरियो"
msgid "Failed"
@@ -17025,7 +17025,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "लेख्नका लागि %s खोल्न सकिदैन!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "फाइल स्थान्तरणमा असफल; अन्य साइड सम्भवत: रद्द गरियो ।"
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/nl.po
--- a/po/nl.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/nl.po Mon Sep 13 09:57:03 2010 +0000
@@ -804,7 +804,7 @@
msgid "Waiting for transfer to begin"
msgstr "Wacht op starten van overdracht"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Geannuleerd"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/nn.po
--- a/po/nn.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/nn.po Mon Sep 13 09:57:03 2010 +0000
@@ -797,7 +797,7 @@
msgid "Waiting for transfer to begin"
msgstr "Ventar på at overføringa skal begynna"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Avbroten"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/oc.po
--- a/po/oc.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/oc.po Mon Sep 13 09:57:03 2010 +0000
@@ -754,7 +754,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Anullat"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/or.po
--- a/po/or.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/or.po Mon Sep 13 09:57:03 2010 +0000
@@ -799,7 +799,7 @@
msgid "Waiting for transfer to begin"
msgstr "ସ୍ଥାନାନ୍ତରଣ ଆରମ୍ଭ ହେବାକୁ ଅପେକ୍ଷା କରୁଛି"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "ବାତିଲ କରାଗଲା"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/pa.po
--- a/po/pa.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/pa.po Mon Sep 13 09:57:03 2010 +0000
@@ -784,7 +784,7 @@
msgid "Waiting for transfer to begin"
msgstr "ਭੇਜਣ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਉਡੀਕ ਜਾਰੀ"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "ਰੱਦ ਹੈ"
msgid "Failed"
@@ -15891,7 +15891,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/pl.po
--- a/po/pl.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/pl.po Mon Sep 13 09:57:03 2010 +0000
@@ -818,7 +818,7 @@
msgid "Waiting for transfer to begin"
msgstr "Oczekiwanie na rozpoczęcie przesyłu"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Anulowano"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/ps.po
--- a/po/ps.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ps.po Mon Sep 13 09:57:03 2010 +0000
@@ -779,7 +779,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr "فسخ شوه"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/pt.po
--- a/po/pt.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/pt.po Mon Sep 13 09:57:03 2010 +0000
@@ -843,7 +843,7 @@
msgid "Waiting for transfer to begin"
msgstr "Esperando que a transferência comece"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelado"
msgid "Failed"
@@ -17029,7 +17029,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Não foi possível abrir %s para escrita!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a."
diff -r 581a070c3737 -r 66981e71af29 po/pt_BR.po
--- a/po/pt_BR.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/pt_BR.po Mon Sep 13 09:57:03 2010 +0000
@@ -804,7 +804,7 @@
msgid "Waiting for transfer to begin"
msgstr "Esperando o começo da transferência"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Cancelada"
msgid "Failed"
@@ -16432,7 +16432,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Não foi possível abrir %s para escrita!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Transferência de arquivo falhou; o outro lado provavelmente cancelou-a."
diff -r 581a070c3737 -r 66981e71af29 po/ro.po
--- a/po/ro.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ro.po Mon Sep 13 09:57:03 2010 +0000
@@ -807,7 +807,7 @@
msgid "Waiting for transfer to begin"
msgstr "Se așteaptă începerea transferului"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Oprit"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/ru.po
--- a/po/ru.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ru.po Mon Sep 13 09:57:03 2010 +0000
@@ -807,7 +807,7 @@
msgid "Waiting for transfer to begin"
msgstr "Ожидание начала передачи"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Отменено"
msgid "Failed"
@@ -16446,7 +16446,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Не удалось открыть %s для записи!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Не удалось произвести передачу файлов; вероятно, отменили на той стороне."
diff -r 581a070c3737 -r 66981e71af29 po/si.po
--- a/po/si.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/si.po Mon Sep 13 09:57:03 2010 +0000
@@ -757,7 +757,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr "අහෝසි කරන්න"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/sk.po
--- a/po/sk.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/sk.po Mon Sep 13 09:57:03 2010 +0000
@@ -803,7 +803,7 @@
msgid "Waiting for transfer to begin"
msgstr "Čaká sa na začiatok prenosu"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Zrušené"
msgid "Failed"
@@ -16124,7 +16124,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Nepodarilo sa otvoriť %s pre zápis!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Prenos súboru zlyhal; druhá strana ho asi zrušila."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/sl.po
--- a/po/sl.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/sl.po Mon Sep 13 09:57:03 2010 +0000
@@ -812,7 +812,7 @@
msgid "Waiting for transfer to begin"
msgstr "Čakanje na začetek prenosa"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Preklicano"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/sq.po
--- a/po/sq.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/sq.po Mon Sep 13 09:57:03 2010 +0000
@@ -814,7 +814,7 @@
msgid "Waiting for transfer to begin"
msgstr "Po pritet të fillojë shpërngulja"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Anuluar"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/sr.po
--- a/po/sr.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/sr.po Mon Sep 13 09:57:03 2010 +0000
@@ -791,7 +791,7 @@
msgid "Waiting for transfer to begin"
msgstr "Чекам да пренос почне"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Откажи"
msgid "Failed"
@@ -16453,7 +16453,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Не могу да отворим %s за упис!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/sr@latin.po
--- a/po/sr@latin.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/sr@latin.po Mon Sep 13 09:57:03 2010 +0000
@@ -792,7 +792,7 @@
msgid "Waiting for transfer to begin"
msgstr "Čekam da prenos počne"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Otkaži"
msgid "Failed"
@@ -16471,7 +16471,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Ne mogu da otvorim %s za upis!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/sv.po
--- a/po/sv.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/sv.po Mon Sep 13 09:57:03 2010 +0000
@@ -797,7 +797,7 @@
msgid "Waiting for transfer to begin"
msgstr "Väntar på att överföringen ska inledas"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Avbruten"
msgid "Failed"
@@ -16135,7 +16135,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Kunde inte öppna %s för läsning!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
diff -r 581a070c3737 -r 66981e71af29 po/sw.po
--- a/po/sw.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/sw.po Mon Sep 13 09:57:03 2010 +0000
@@ -784,7 +784,7 @@
msgid "Waiting for transfer to begin"
msgstr ""
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Imeghairishwa"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/ta.po
--- a/po/ta.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ta.po Mon Sep 13 09:57:03 2010 +0000
@@ -795,7 +795,7 @@
msgid "Waiting for transfer to begin"
msgstr "பரிமாற்றம் ஆரம்பமாவதற்காக காத்திருக்கிறது"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "தவிர்க்கப்பட்டது"
msgid "Failed"
@@ -16101,7 +16101,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "%s யை எழுதுவதற்காக திறக்கமுடியவில்லை!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "கோப்பு அனுப்புதலில் பிழை; ஒருவேளை மறுபக்கத்தில் தவிர்த்திருக்கலாம்."
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/te.po
--- a/po/te.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/te.po Mon Sep 13 09:57:03 2010 +0000
@@ -787,7 +787,7 @@
msgid "Waiting for transfer to begin"
msgstr "ప్రారంభించడానికి బదిలీ కోసం నిరీక్షణ "
-msgid "Canceled"
+msgid "Cancelled"
msgstr "రద్దుచేయి"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/th.po
--- a/po/th.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/th.po Mon Sep 13 09:57:03 2010 +0000
@@ -804,7 +804,7 @@
msgid "Waiting for transfer to begin"
msgstr "กำลังรอการรับส่งแฟ้ม"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "ยกเลิก"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/tr.po
--- a/po/tr.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/tr.po Mon Sep 13 09:57:03 2010 +0000
@@ -805,7 +805,7 @@
msgid "Waiting for transfer to begin"
msgstr "Aktarımın başlaması bekleniyor"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "İptal Edildi"
msgid "Failed"
@@ -16367,7 +16367,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "%s yazma için açılamıyor!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir."
diff -r 581a070c3737 -r 66981e71af29 po/uk.po
--- a/po/uk.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/uk.po Mon Sep 13 09:57:03 2010 +0000
@@ -809,7 +809,7 @@
msgid "Waiting for transfer to begin"
msgstr "Очікування початку передачі"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Скасовано"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/ur.po
--- a/po/ur.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/ur.po Mon Sep 13 09:57:03 2010 +0000
@@ -815,7 +815,7 @@
msgid "Waiting for transfer to begin"
msgstr "ٹرانسفر ہونے کے لئے انتظار کررہا ہے"
-msgid "Canceled"
+msgid "Cancelled"
msgstr " منسوخ کیا گیا"
msgid "Failed"
@@ -16800,7 +16800,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "لکھنے کے لئے %s کھول نہیں سکا!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "فائل ٹرانسفر ناکام ہوا؛یا ممکن ہے دوسری حانب منسوخ ہوا ہے۔"
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/vi.po
--- a/po/vi.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/vi.po Mon Sep 13 09:57:03 2010 +0000
@@ -805,7 +805,7 @@
msgid "Waiting for transfer to begin"
msgstr "Đợi bắt đầu truyền"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "Bị thôi"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/xh.po
--- a/po/xh.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/xh.po Mon Sep 13 09:57:03 2010 +0000
@@ -843,7 +843,7 @@
msgid "Waiting for transfer to begin"
msgstr "Ulindele ukuba ukudlulisa kuqalise"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "IRhoxisiwe"
msgid "Failed"
@@ -17192,7 +17192,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr ""
#~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe."
diff -r 581a070c3737 -r 66981e71af29 po/zh_CN.po
--- a/po/zh_CN.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/zh_CN.po Mon Sep 13 09:57:03 2010 +0000
@@ -777,7 +777,7 @@
msgid "Waiting for transfer to begin"
msgstr "正在等待传送开始"
-msgid "Canceled"
+msgid "Cancelled"
msgstr "已取消"
msgid "Failed"
@@ -15530,7 +15530,7 @@
#~ msgid "Could not open %s for writing!"
#~ msgstr "无法打开 %s 写入！"
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
#~ msgstr "文件传送失败；可能其中一端取消了传送。"
#~ msgid "Could not connect for transfer."
diff -r 581a070c3737 -r 66981e71af29 po/zh_HK.po
--- a/po/zh_HK.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/zh_HK.po Mon Sep 13 09:57:03 2010 +0000
@@ -868,7 +868,7 @@
msgid "Waiting for transfer to begin"
msgstr "等待開始傳輸檔案中..."
-msgid "Canceled"
+msgid "Cancelled"
msgstr "已取消"
msgid "Failed"
diff -r 581a070c3737 -r 66981e71af29 po/zh_TW.po
--- a/po/zh_TW.po Fri Aug 20 08:35:27 2010 +0000
+++ b/po/zh_TW.po Mon Sep 13 09:57:03 2010 +0000
@@ -866,7 +866,7 @@
msgid "Waiting for transfer to begin"
msgstr "等待開始傳輸檔案中..."
-msgid "Canceled"
+msgid "Cancelled"
msgstr "已取消"
msgid "Failed"