Mercurial > pidgin
changeset 17809:be7e6375ce7e
merge of '15c67573c5441bdd943fcf07e496016c58492c19'
and '667956be4f81c42d9061470e5111d09a1516db33'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 27 May 2007 17:45:43 +0000 |
| parents | 4d53be63a558 (current diff) 0f65c1856f55 (diff) |
| children | 8bc2b7ec45c1 |
| files | pidgin/gtkconv.c pidgin/gtkimhtml.c |
| diffstat | 4 files changed, 23 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Sun May 27 02:11:53 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Sun May 27 17:45:43 2007 +0000 @@ -901,6 +901,7 @@ syn_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) { MsnSession *session; + MsnSync *sync; int total_users; session = cmdproc->session; @@ -919,22 +920,12 @@ total_users = atoi(cmd->params[2]); - if (total_users == 0) - { - msn_session_finish_login(session); - } - else - { - /* syn_table */ - MsnSync *sync; + sync = msn_sync_new(session); + sync->total_users = total_users; + sync->old_cbs_table = cmdproc->cbs_table; - sync = msn_sync_new(session); - sync->total_users = total_users; - sync->old_cbs_table = cmdproc->cbs_table; - - session->sync = sync; - cmdproc->cbs_table = sync->cbs_table; - } + session->sync = sync; + cmdproc->cbs_table = sync->cbs_table; } /**************************************************************************
--- a/libpurple/protocols/msn/sync.c Sun May 27 02:11:53 2007 +0000 +++ b/libpurple/protocols/msn/sync.c Sun May 27 17:45:43 2007 +0000 @@ -99,8 +99,19 @@ /* HACK */ if (group_id == 0) + { /* Group of ungroupped buddies */ + if (session->sync->total_users == 0) + { + cmdproc->cbs_table = session->sync->old_cbs_table; + + msn_session_finish_login(session); + + msn_sync_destroy(session->sync); + session->sync = NULL; + } return; + } if ((purple_find_group(name)) == NULL) {
--- a/pidgin/gtkconv.c Sun May 27 02:11:53 2007 +0000 +++ b/pidgin/gtkconv.c Sun May 27 17:45:43 2007 +0000 @@ -7802,7 +7802,9 @@ entry = gtk_entry_new(); gtk_entry_set_has_frame(GTK_ENTRY(entry), FALSE); gtk_entry_set_width_chars(GTK_ENTRY(entry), 10); +#if GTK_CHECK_VERSION(2,4,0) gtk_entry_set_alignment(GTK_ENTRY(entry), 0.5); +#endif gtk_box_pack_start(GTK_BOX(gtkconv->tabby), entry, TRUE, TRUE, 0); /* after the tab label */ @@ -8224,7 +8226,9 @@ } ebox = gtk_event_box_new(); +#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); +#endif gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby); g_signal_connect(G_OBJECT(ebox), "button-press-event", G_CALLBACK(alias_double_click_cb), gtkconv);
--- a/pidgin/gtkimhtml.c Sun May 27 02:11:53 2007 +0000 +++ b/pidgin/gtkimhtml.c Sun May 27 17:45:43 2007 +0000 @@ -4433,7 +4433,9 @@ if (imhtml_smiley && imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) { ebox = gtk_event_box_new(); +#if GTK_CHECK_VERSION(2,4,0) gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); +#endif gtk_widget_show(ebox); }