Mercurial > pidgin.yaz
changeset 18558:57fc767ceb7a
merge of 'c461aa1e202a65745f6b1de51f4bea0016abc463'
and 'c744943b15971b45170f58c482f6a79ca8af72c5'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 17 Jul 2007 17:03:59 +0000 |
| parents | ab58b55f38b0 (diff) 9cbddf60a068 (current diff) |
| children | 4df67bf416be 4cfc52d22970 7d0c12b5dda8 |
| files | |
| diffstat | 5 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gnttextview.h Tue Jul 17 17:03:51 2007 +0000 +++ b/finch/libgnt/gnttextview.h Tue Jul 17 17:03:59 2007 +0000 @@ -47,7 +47,7 @@ typedef struct _GntTextViewPriv GntTextViewPriv; typedef struct _GntTextViewClass GntTextViewClass; -typedef enum { +typedef enum _GntTextViewFlag { GNT_TEXT_VIEW_NO_SCROLL = 1 << 0, GNT_TEXT_VIEW_WRAP_CHAR = 1 << 1, } GntTextViewFlag;
--- a/finch/libgnt/gnttree.h Tue Jul 17 17:03:51 2007 +0000 +++ b/finch/libgnt/gnttree.h Tue Jul 17 17:03:59 2007 +0000 @@ -47,7 +47,7 @@ typedef struct _GntTreeRow GntTreeRow; typedef struct _GntTreeCol GntTreeCol; -typedef enum { +typedef enum _GntTreeColumnFlag { GNT_TREE_COLUMN_INVISIBLE = 1 << 0, GNT_TREE_COLUMN_FIXED_SIZE = 1 << 1, GNT_TREE_COLUMN_BINARY_DATA = 1 << 2,
--- a/finch/libgnt/gntwm.c Tue Jul 17 17:03:51 2007 +0000 +++ b/finch/libgnt/gntwm.c Tue Jul 17 17:03:59 2007 +0000 @@ -914,7 +914,7 @@ len = wcstombs(NULL, wide, 0) + 1; string = g_new0(char, len); wcstombs(string, wide, len); - ret = gnt_util_onscreen_width(string, NULL); + ret = string ? gnt_util_onscreen_width(string, NULL) : 1; g_free(string); return ret; }
--- a/libpurple/protocols/msn/notification.c Tue Jul 17 17:03:51 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Tue Jul 17 17:03:59 2007 +0000 @@ -705,7 +705,7 @@ user = msn_userlist_find_user(session->userlist, passport); old_friendly = msn_user_get_friendly_name(user); - if (!old_friendly || (old_friendly && strcmp(old_friendly, friendly))) + if (!old_friendly || (old_friendly && (!friendly || strcmp(old_friendly, friendly)))) { serv_got_alias(gc, passport, friendly); msn_user_set_friendly_name(user, friendly);
--- a/libpurple/protocols/oscar/family_locate.c Tue Jul 17 17:03:51 2007 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Tue Jul 17 17:03:59 2007 +0000 @@ -1264,10 +1264,13 @@ * this buddy's info explicitly, then notify them that we have info * for this buddy. */ - was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn); - if (was_explicit == TRUE) - if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) - ret = userfunc(od, conn, frame, userinfo2); + if (userinfo2 != NULL) + { + was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn); + if (was_explicit == TRUE) + if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) + ret = userfunc(od, conn, frame, userinfo2); + } return ret; }