Mercurial > pidgin
changeset 18209:d3cd11e13557
merge of '2516286ed0a89379b3fcf748790a46d6c43e3d03'
and '91946ce81cbf435a1b2e773aa1985115486f3af4'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Wed, 20 Jun 2007 18:22:19 +0000 |
| parents | 669dc8404b56 (diff) 692cded900f8 (current diff) |
| children | b8572b937c09 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Wed Jun 20 06:25:12 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Jun 20 18:22:19 2007 +0000 @@ -5573,7 +5573,7 @@ status = purple_presence_get_active_status(presence); id = purple_status_get_id(status); - if (!purple_presence_is_online(presence)) + if ((od != NULL) && !purple_presence_is_online(presence)) { char *gname = aim_ssi_itemlist_findparentname(od->ssi.local, b->name); if (aim_ssi_waitingforauth(od->ssi.local, gname, b->name))
--- a/pidgin/gtkblist.c Wed Jun 20 06:25:12 2007 +0000 +++ b/pidgin/gtkblist.c Wed Jun 20 18:22:19 2007 +0000 @@ -311,6 +311,7 @@ gtk_blist_join_chat(chat); } +#if GTK_CHECK_VERSION(2,6,0) static void gtk_blist_renderer_editing_cancelled_cb(GtkCellRenderer *renderer, PurpleBuddyList *list) { editing_blist = FALSE; @@ -355,6 +356,7 @@ } editing_blist = TRUE; } +#endif static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1, char *arg2, PurpleBuddyList *list) @@ -4463,8 +4465,10 @@ #endif "markup", NAME_COLUMN, NULL); +#if GTK_CHECK_VERSION(2,6,0) g_signal_connect(G_OBJECT(rend), "editing-started", G_CALLBACK(gtk_blist_renderer_editing_started_cb), NULL); g_signal_connect(G_OBJECT(rend), "editing-canceled", G_CALLBACK(gtk_blist_renderer_editing_cancelled_cb), list); +#endif g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), list); g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL); #if GTK_CHECK_VERSION(2,6,0)