Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 19518:e2b7dadac415
merge of 'ee4f8f7ebf5f6057974f66b75c8b59c199e44ae0'
and 'f832db29755469f6ba20426b58a55928365406c3'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 29 Aug 2007 01:46:45 +0000 |
parents | 4da3c8618c24 b66909a58e5f |
children | 11de4598b4c5 ee5551542eee |
comparison
equal
deleted
inserted
replaced
19515:b62683f4120d | 19518:e2b7dadac415 |
---|---|
8878 TRUE, GTK_PACK_START); | 8878 TRUE, GTK_PACK_START); |
8879 | 8879 |
8880 if (pidgin_conv_window_get_gtkconv_count(win) == 1) | 8880 if (pidgin_conv_window_get_gtkconv_count(win) == 1) |
8881 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), | 8881 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), |
8882 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs") && | 8882 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs") && |
8883 (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") || | 8883 (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") || |
8884 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT || | 8884 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") != GTK_POS_TOP)); |
8885 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT)); | |
8886 | 8885 |
8887 /* show the widgets */ | 8886 /* show the widgets */ |
8888 /* gtk_widget_show(gtkconv->icon); */ | 8887 /* gtk_widget_show(gtkconv->icon); */ |
8889 gtk_widget_show(gtkconv->tab_label); | 8888 gtk_widget_show(gtkconv->tab_label); |
8890 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs")) | 8889 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs")) |