Mercurial > pidgin
changeset 24066:5a96b250b36d
merge of '44df11dd9d1db0245be1ab1ac5410821b1c9f2af'
and '47119315e21668ee63084a57c70abbbba5400cb4'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Thu, 04 Sep 2008 22:56:26 +0000 |
| parents | 85bed17fe5c1 (diff) 635b7cd19110 (current diff) |
| children | de712dc6fecd bb99ee66120e |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/sslconn.h Thu Sep 04 22:45:17 2008 +0000 +++ b/libpurple/sslconn.h Thu Sep 04 22:56:26 2008 +0000 @@ -67,7 +67,7 @@ int fd; /** Glib event source ID; used to refer to the received data callback * in the glib eventloop */ - int inpa; + guint inpa; /** Data related to the underlying TCP connection */ PurpleProxyConnectData *connect_data;
--- a/pidgin/gtkconv.c Thu Sep 04 22:45:17 2008 +0000 +++ b/pidgin/gtkconv.c Thu Sep 04 22:56:26 2008 +0000 @@ -7183,6 +7183,14 @@ pidgin_conv_update_buddy_icon(conv); } } + + /* Make the tabs show/hide correctly */ + for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) { + PidginWindow *win = l->data; + if (pidgin_conv_window_get_gtkconv_count(win) == 1) + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), + GPOINTER_TO_INT(value) == 0); + } } static void