Mercurial > pidgin

comparison src/gtkconv.c @ 6640:314111e7b601

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7165] Changed several calls from gaim_find_conversation() to gaim_find_conversation_with_account(). committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 28 Aug 2003 01:18:50 +0000
parents bdc448cf4cb6
children 0c5637b5462e
comparison
equal deleted inserted replaced
6639:1b91cb6be4c3 6640:314111e7b601
876 if (*name == '%') name++; 876 if (*name == '%') name++;
877 if (*name == '+') name++; 877 if (*name == '+') name++;
878 878
879 account = gaim_conversation_get_account(conv); 879 account = gaim_conversation_get_account(conv);
880 880
881 conv2 = gaim_find_conversation(name); 881 conv2 = gaim_find_conversation_with_account(name, account);
882 882
883 if (conv2 != NULL) { 883 if (conv2 != NULL)
884 gaim_window_raise(gaim_conversation_get_window(conv2)); 884 gaim_window_raise(gaim_conversation_get_window(conv2));
885 gaim_conversation_set_account(conv2, account);
886 }
887 else 885 else
888 conv2 = gaim_conversation_new(GAIM_CONV_IM, account, name); 886 conv2 = gaim_conversation_new(GAIM_CONV_IM, account, name);
889 } 887 }
890 888
891 static void 889 static void
933 931
934 who = g_object_get_data(G_OBJECT(w), "user_data"); 932 who = g_object_get_data(G_OBJECT(w), "user_data");
935 933
936 account = gaim_conversation_get_account(conv); 934 account = gaim_conversation_get_account(conv);
937 935
938 conv2 = gaim_find_conversation(who); 936 conv2 = gaim_find_conversation_with_account(who, account);
939 937
940 if (conv2 != NULL) 938 if (conv2 != NULL)
941 gaim_window_show(gaim_conversation_get_window(conv2)); 939 gaim_window_show(gaim_conversation_get_window(conv2));
942 else 940 else
943 conv2 = gaim_conversation_new(GAIM_CONV_IM, account, who); 941 conv2 = gaim_conversation_new(GAIM_CONV_IM, account, who);
1051 if (*who == '+') who++; 1049 if (*who == '+') who++;
1052 1050
1053 if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) { 1051 if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
1054 GaimConversation *c; 1052 GaimConversation *c;
1055 1053
1056 if ((c = gaim_find_conversation(who)) == NULL) 1054 if ((c = gaim_find_conversation_with_account(who, account)) == NULL)
1057 c = gaim_conversation_new(GAIM_CONV_IM, account, who); 1055 c = gaim_conversation_new(GAIM_CONV_IM, account, who);
1058 else 1056 else
1059 gaim_conversation_set_account(c, account); 1057 gaim_conversation_set_account(c, account);
1060 } 1058 }
1061 else if (event->button == 3 && event->type == GDK_BUTTON_PRESS) { 1059 else if (event->button == 3 && event->type == GDK_BUTTON_PRESS) {