im.pidgin.pidgin: fbb7ffaf4075cf690cc3ff9d171e56320e9af8da
datallah at pidgin.im
datallah at pidgin.im
Tue Oct 2 20:50:33 EDT 2007
revision: fbb7ffaf4075cf690cc3ff9d171e56320e9af8da
date: 2007-10-03T00:45:12
author: datallah at pidgin.im
branch: im.pidgin.pidgin
changelog:
merge of '5eed7d5d3539cd18c81cb4d709080ea5bc109bac'
and 'c180c5d69d4c73b8c1f08f48824d93fbeb3b44e8'
manifest:
format_version "1"
new_manifest [9c752e47d1d32e059180edb137e54482aa82210f]
old_revision [5eed7d5d3539cd18c81cb4d709080ea5bc109bac]
patch "libpurple/protocols/gg/buddylist.c"
from [aa1eb8a29f943a90c6fb14c0f6934123fc6b8730]
to [353535de7d31ded3a69e0486d86d6d22604f31e6]
old_revision [c180c5d69d4c73b8c1f08f48824d93fbeb3b44e8]
add_dir "pidgin/pixmaps/toolbar/11"
add_file "pidgin/pixmaps/status/11/log-in.png"
content [0be4a0be280cce09c33ae144538a098abfe260ab]
add_file "pidgin/pixmaps/status/11/log-out.png"
content [e201025bec5d6e617f6803194d47bcf687b9adc7]
add_file "pidgin/pixmaps/toolbar/11/message-new.png"
content [e38d4bfbcfc15be6bf236e0590521a0bae7de169]
patch "libpurple/protocols/msn/soap.c"
from [b4246c343cc7a5051c673f14257ab0918a4db156]
to [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]
patch "pidgin/pidginstock.c"
from [a1a460cffd8fa050434e5402f4800f561f2528c5]
to [2c265aa9d5a211ec43e10e414febf9937bb03420]
patch "pidgin/pixmaps/status/11/Makefile.am"
from [9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b]
to [206419b4c8fd3cec428f705dab89a09c27326636]
patch "pidgin/pixmaps/toolbar/Makefile.am"
from [497746a6a16a636054c83cdb0f459206aa1ad609]
to [c5081b872303b49b303ca69d9ae94176f98e00e1]
patch "pidgin/win32/nsis/pixmaps/pidgin-intro.bmp"
from [743fe3b36d453397c445fe08ea301f9163b07923]
to [a286d035366a6522fa166cc53fcbfbaa2f2de370]
set "pidgin/pixmaps/status/11/log-in.png"
attr "mtn:manual_merge"
value "true"
set "pidgin/pixmaps/status/11/log-out.png"
attr "mtn:manual_merge"
value "true"
set "pidgin/pixmaps/toolbar/11/message-new.png"
attr "mtn:manual_merge"
value "true"
-------------- next part --------------
#
#
# patch "libpurple/protocols/gg/buddylist.c"
# from [aa1eb8a29f943a90c6fb14c0f6934123fc6b8730]
# to [353535de7d31ded3a69e0486d86d6d22604f31e6]
#
============================================================
--- libpurple/protocols/gg/buddylist.c aa1eb8a29f943a90c6fb14c0f6934123fc6b8730
+++ libpurple/protocols/gg/buddylist.c 353535de7d31ded3a69e0486d86d6d22604f31e6
@@ -27,6 +27,13 @@
#include "gg-utils.h"
#include "buddylist.h"
+#define F_FIRSTNAME 0
+#define F_LASTNAME 1
+/* #define F_ 2 */
+#define F_NICKNAME 3
+#define F_PHONE 4
+#define F_GROUP 5
+#define F_UIN 6
/* void ggp_buddylist_send(PurpleConnection *gc) {{{ */
void ggp_buddylist_send(PurpleConnection *gc)
@@ -90,7 +97,7 @@ void ggp_buddylist_load(PurpleConnection
gchar **users_tbl;
int i;
- /* Don't limit a number of records in a buddylist. */
+ /* Don't limit the number of records in a buddylist. */
users_tbl = g_strsplit(buddylist, "\r\n", -1);
for (i = 0; users_tbl[i] != NULL; i++) {
@@ -108,8 +115,8 @@ void ggp_buddylist_load(PurpleConnection
continue;
}
- show = charset_convert(data_tbl[3], "CP1250", "UTF-8");
- name = data_tbl[6];
+ show = charset_convert(data_tbl[F_NICKNAME], "CP1250", "UTF-8");
+ name = data_tbl[F_UIN];
if ('\0' == *name) {
purple_debug_warning("gg",
"Something is wrong on line %d of the buddylist. Skipping.\n",
@@ -121,7 +128,7 @@ void ggp_buddylist_load(PurpleConnection
show = g_strdup(name);
}
- purple_debug_info("gg", "got buddy: name=%s show=%s\n", name, show);
+ purple_debug_info("gg", "got buddy: name=%s; show=%s\n", name, show);
if (purple_find_buddy(purple_connection_get_account(gc), name)) {
g_free(show);
@@ -131,19 +138,19 @@ void ggp_buddylist_load(PurpleConnection
g = g_strdup("Gadu-Gadu");
- if ('\0' != data_tbl[5]) {
+ if ('\0' != data_tbl[F_GROUP]) {
/* XXX: Probably buddy should be added to all the groups. */
/* Hard limit to at most 50 groups */
- gchar **group_tbl = g_strsplit(data_tbl[5], ",", 50);
+ gchar **group_tbl = g_strsplit(data_tbl[F_GROUP], ",", 50);
if (ggp_array_size(group_tbl) > 0) {
g_free(g);
- g = g_strdup(group_tbl[0]);
+ g = charset_convert(group_tbl[0], "CP1250", "UTF-8");
}
g_strfreev(group_tbl);
}
buddy = purple_buddy_new(purple_connection_get_account(gc), name,
- strlen(show) ? show : NULL);
+ strlen(show) ? show : NULL);
if (!(group = purple_find_group(g))) {
group = purple_group_new(g);
@@ -159,7 +166,6 @@ void ggp_buddylist_load(PurpleConnection
g_strfreev(users_tbl);
ggp_buddylist_send(gc);
-
}
/* }}} */
@@ -192,8 +198,7 @@ void ggp_buddylist_offline(PurpleConnect
continue;
purple_prpl_got_user_status(
- purple_connection_get_account(gc),
- buddy->name, "offline", NULL);
+ account, buddy->name, "offline", NULL);
purple_debug_info("gg",
"ggp_buddylist_offline: gone: %s\n",
-------------- next part --------------
#
#
# add_dir "pidgin/pixmaps/toolbar/11"
#
# add_file "pidgin/pixmaps/status/11/log-in.png"
# content [0be4a0be280cce09c33ae144538a098abfe260ab]
#
# add_file "pidgin/pixmaps/status/11/log-out.png"
# content [e201025bec5d6e617f6803194d47bcf687b9adc7]
#
# add_file "pidgin/pixmaps/toolbar/11/message-new.png"
# content [e38d4bfbcfc15be6bf236e0590521a0bae7de169]
#
# patch "libpurple/protocols/msn/soap.c"
# from [b4246c343cc7a5051c673f14257ab0918a4db156]
# to [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]
#
# patch "pidgin/pidginstock.c"
# from [a1a460cffd8fa050434e5402f4800f561f2528c5]
# to [2c265aa9d5a211ec43e10e414febf9937bb03420]
#
# patch "pidgin/pixmaps/status/11/Makefile.am"
# from [9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b]
# to [206419b4c8fd3cec428f705dab89a09c27326636]
#
# patch "pidgin/pixmaps/toolbar/Makefile.am"
# from [497746a6a16a636054c83cdb0f459206aa1ad609]
# to [c5081b872303b49b303ca69d9ae94176f98e00e1]
#
# patch "pidgin/win32/nsis/pixmaps/pidgin-intro.bmp"
# from [743fe3b36d453397c445fe08ea301f9163b07923]
# to [a286d035366a6522fa166cc53fcbfbaa2f2de370]
#
# set "pidgin/pixmaps/status/11/log-in.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "pidgin/pixmaps/status/11/log-out.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "pidgin/pixmaps/toolbar/11/message-new.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# pidgin/pixmaps/status/11/log-in.png is binary
============================================================
# pidgin/pixmaps/status/11/log-out.png is binary
============================================================
# pidgin/pixmaps/toolbar/11/message-new.png is binary
============================================================
--- libpurple/protocols/msn/soap.c b4246c343cc7a5051c673f14257ab0918a4db156
+++ libpurple/protocols/msn/soap.c 8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7
@@ -26,7 +26,7 @@
#include "msn.h"
#include "soap.h"
-
+#define MSN_SOAP_DEBUG
/*local function prototype*/
void msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step);
============================================================
--- pidgin/pidginstock.c a1a460cffd8fa050434e5402f4800f561f2528c5
+++ pidgin/pidginstock.c 2c265aa9d5a211ec43e10e414febf9937bb03420
@@ -114,11 +114,11 @@ static struct SizedStockIcon {
{ PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I },
- { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
- { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
+ { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
+ { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
{ PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I },
{ PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
- { PIDGIN_STOCK_STATUS_MESSAGE, "toolbar", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
+ { PIDGIN_STOCK_STATUS_MESSAGE, "toolbar", "message-new.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_IGNORED, "emblems", "blocked.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
{ PIDGIN_STOCK_STATUS_FOUNDER, "emblems", "founder.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
============================================================
--- pidgin/pixmaps/status/11/Makefile.am 9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b
+++ pidgin/pixmaps/status/11/Makefile.am 206419b4c8fd3cec428f705dab89a09c27326636
@@ -6,6 +6,8 @@ EXTRA_DIST = available.png \
chat.png \
extended-away.png \
invisible.png \
+ log-in.png \
+ log-out.png \
offline.png \
person.png
============================================================
--- pidgin/pixmaps/toolbar/Makefile.am 497746a6a16a636054c83cdb0f459206aa1ad609
+++ pidgin/pixmaps/toolbar/Makefile.am c5081b872303b49b303ca69d9ae94176f98e00e1
@@ -1,6 +1,11 @@ SUBDIRS = 16 22
SUBDIRS = 16 22
+TINY_ICONS = 11/message-new.png
EXTRA_DIST = \
Makefile.mingw \
16/Makefile.mingw \
+ 22/Makefile.mingw \
+ $(TINY_ICONS)
+
+pidgintinytoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/11
+pidgintinytoolbarpix_DATA = $(TINY_ICONS)
- 22/Makefile.mingw
============================================================
# pidgin/win32/nsis/pixmaps/pidgin-intro.bmp is binary
More information about the Commits
mailing list