Index: src/conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.605
diff -u -p -r1.605 conversation.c
--- src/conversation.c 28 May 2004 05:53:33 -0000 1.605
+++ src/conversation.c 28 May 2004 20:08:26 -0000
@@ -2263,7 +2263,7 @@ conv_placement_last_created_win(GaimConv
{
GaimConvWindow *win;
-#if 0 /* Last-minute prefslash */
+#if 1 /* Last-minute prefslash */
if (gaim_prefs_get_bool("/core/conversations/combine_chat_im"))
win = g_list_last(gaim_get_windows())->data;
else
@@ -2357,8 +2357,13 @@ conv_placement_by_group(GaimConversation
conv2 = (GaimConversation *)cl->data;
group2 = conv_get_group(conv2);
-
+#if 1 /* temporary unprefslash */
+ if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") ||
+ type == gaim_conversation_get_type(conv2)) &&
+ group == group2)
+#else
if (group == group2)
+#endif
{
gaim_conv_window_add_conversation(win2, conv);
@@ -2396,7 +2401,13 @@ conv_placement_by_account(GaimConversati
{
conv2 = (GaimConversation *)convs->data;
+#if 1 /* temporary unprefslash */
+ if ((gaim_prefs_get_bool("/core/conversations/combine_chat_im") ||
+ type == gaim_conversation_get_type(conv2)) &&
+ account == gaim_conversation_get_account(conv2))
+#else
if (account == gaim_conversation_get_account(conv2))
+#endif
{
gaim_conv_window_add_conversation(win2, conv);
return;
Index: src/gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.385
diff -u -p -r1.385 gtkconv.c
--- src/gtkconv.c 28 May 2004 06:08:02 -0000 1.385
+++ src/gtkconv.c 28 May 2004 20:08:28 -0000
@@ -4482,7 +4482,7 @@ gaim_gtkconv_write_im(GaimConversation *
g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL);
if (!(flags & GAIM_MESSAGE_NO_LOG) &&
- gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+ gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")) {
gaim_conv_window_raise(gaim_conversation_get_window(conv));
}
@@ -4547,7 +4547,7 @@ gaim_gtkconv_write_chat(GaimConversation
/* Raise the window, if specified in prefs. */
if (!(flags & GAIM_MESSAGE_NO_LOG) &&
/* we may want to change this */
- gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+ gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) {
gaim_conv_window_raise(gaim_conversation_get_window(conv));
}
@@ -4578,7 +4578,11 @@ gaim_gtkconv_write_conv(GaimConversation
win = gaim_conversation_get_window(conv);
- if (!(flags & GAIM_MESSAGE_NO_LOG) && gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+ if (!(flags & GAIM_MESSAGE_NO_LOG) &&
+ ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
+ gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) ||
+ (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
+ gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")))) {
gaim_conv_window_show(win);
}
@@ -5813,10 +5817,10 @@ gaim_gtk_conversations_init(void)
gaim_prefs_add_int("/gaim/gtk/conversations/tab_side", GTK_POS_TOP);
gaim_prefs_add_int("/gaim/gtk/conversations/button_type",
GAIM_BUTTON_TEXT_IMAGE);
- gaim_prefs_add_bool("/gaim/gtk/conversations/raise_on_events", FALSE);
+ gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE);
+ gaim_prefs_add_bool("/gaim/gtk/conversations/chat/raise_on_events", FALSE);
gaim_prefs_rename("/gaim/gtk/conversations/im/buton_type", "/gaim/gtk/conversations/button_type");
- gaim_prefs_rename("/gaim/gtk/conversations/im/raise_on_events", "/gaim/gtk/conversations/raise_on_events");
-
+
/* Conversations -> Chat */
gaim_prefs_add_none("/gaim/gtk/conversations/chat");
Index: src/gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.177
diff -u -p -r1.177 gtkprefs.c
--- src/gtkprefs.c 28 May 2004 06:12:11 -0000 1.177
+++ src/gtkprefs.c 28 May 2004 20:08:28 -0000
@@ -943,9 +943,10 @@ conversation_placement_cb(const char *na
{
const char *placement = value;
- if (strcmp(placement, "new"))
+ if (strcmp(placement, "new")) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);
- else
+ } else
gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
}
@@ -955,7 +956,7 @@ GtkWidget *conv_page() {
GtkWidget *label;
GtkWidget *close_checkbox;
GtkWidget *tabs_checkbox, *tab_placement;
- /* GtkWidget *same_checkbox, *icons_checkbox; */
+ GtkWidget *same_checkbox; /* , *icons_checkbox; */
GtkSizeGroup *sg;
GList *names = NULL;
@@ -1003,12 +1004,12 @@ GtkWidget *conv_page() {
gaim_gtk_prefs_checkbox(_("Show a_liases in tabs/titles"),
"/core/conversations/use_alias_for_title", vbox);
+ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ vbox = gaim_gtk_make_frame(ret, _("IMs"));
+
gaim_gtk_prefs_checkbox(_("_Raise window on events"),
- "/gaim/gtk/conversations/raise_on_events", vbox);
+ "/gaim/gtk/conversations/im/raise_on_events", vbox);
- /* XXX This caption totally sucks but I can't break the string freeze. */
- gaim_gtk_prefs_checkbox(_("Co_lorize screen names"),
- "/gaim/gtk/conversations/chat/color_nicks", vbox);
gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
"/gaim/gtk/conversations/im/show_buddy_icons", vbox);
gaim_gtk_prefs_checkbox(_("Enable buddy icon a_nimation"),
@@ -1016,6 +1017,16 @@ GtkWidget *conv_page() {
gaim_gtk_prefs_checkbox(_("Notify buddies that you are _typing to them"),
"/core/conversations/im/send_typing", vbox);
+ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ vbox = gaim_gtk_make_frame(ret, _("Chats"));
+
+ gaim_gtk_prefs_checkbox(_("_Raise window on events"),
+ "/gaim/gtk/conversations/chat/raise_on_events", vbox);
+
+ /* XXX This caption totally sucks but I can't break the string freeze. */
+ gaim_gtk_prefs_checkbox(_("Co_lorize screen names"),
+ "/gaim/gtk/conversations/chat/color_nicks", vbox);
+
vbox = gaim_gtk_make_frame (ret, _("Tab Options"));
tabs_checkbox = gaim_gtk_prefs_checkbox(_("Show IMs and chats in _tabbed windows"),
@@ -1023,7 +1034,7 @@ GtkWidget *conv_page() {
if (strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/placement"), "new"))
gtk_widget_set_sensitive(tabs_checkbox, FALSE);
-#if 0 /* Overzealous last-minute prefslashing */
+#if 1 /* Overzealous last-minute prefslashing */
same_checkbox = gaim_gtk_prefs_checkbox(_("Show IMs and chats in _same tabbed window"),
"/core/conversations/combine_chat_im", vbox);
if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")) {
@@ -1031,7 +1042,7 @@ GtkWidget *conv_page() {
}
g_signal_connect(G_OBJECT(tabs_checkbox), "clicked",
- G_CALLBACK(gaim_gtk_toggle_sensitive), same_checkbox);
+ G_CALLBACK(gaim_gtk_toggle_sensitive), same_checkbox);
#endif
placement_pref_id = gaim_prefs_connect_callback("/gaim/gtk/conversations/placement",