Mercurial > pidgin.yaz
comparison src/gtkdialogs.c @ 9728:8be2c406a1f1
[gaim-migrate @ 10589]
"Raise window on events" is no longer "Raise window and steal focus
on events"
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 08 Aug 2004 18:39:27 +0000 |
parents | 2273790bb518 |
children | c9ac1976ef01 |
comparison
equal
deleted
inserted
replaced
9727:4faa27ea2151 | 9728:8be2c406a1f1 |
---|---|
409 gtk_widget_show_all(window); | 409 gtk_widget_show_all(window); |
410 return TRUE; | 410 return TRUE; |
411 } | 411 } |
412 | 412 |
413 void | 413 void |
414 gaim_gtkdialogs_new_im(GaimAccount *account, const char *username) | 414 gaim_gtkdialogs_im_with_user(GaimAccount *account, const char *username) |
415 { | 415 { |
416 GaimConversation *conv; | 416 GaimConversation *conv; |
417 GaimConvWindow *win; | 417 GaimConvWindow *win; |
418 GaimGtkWindow *gtkwin; | |
418 | 419 |
419 conv = gaim_find_conversation_with_account(username, account); | 420 conv = gaim_find_conversation_with_account(username, account); |
420 | 421 |
421 if (conv == NULL) | 422 if (conv == NULL) |
422 conv = gaim_conversation_new(GAIM_CONV_IM, account, username); | 423 conv = gaim_conversation_new(GAIM_CONV_IM, account, username); |
423 | 424 |
424 win = gaim_conversation_get_window(conv); | 425 win = gaim_conversation_get_window(conv); |
425 | 426 gtkwin = GAIM_GTK_WINDOW(win); |
426 gaim_conv_window_raise(win); | 427 |
428 gtk_window_present(GTK_WINDOW(gtkwin->window)); | |
427 gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv)); | 429 gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv)); |
428 } | 430 } |
429 | 431 |
430 static void | 432 static void |
431 new_im_cb(gpointer data, GaimRequestFields *fields) | 433 new_im_cb(gpointer data, GaimRequestFields *fields) |
434 const char *username; | 436 const char *username; |
435 | 437 |
436 account = gaim_request_fields_get_account(fields, "account"); | 438 account = gaim_request_fields_get_account(fields, "account"); |
437 username = gaim_request_fields_get_string(fields, "screenname"); | 439 username = gaim_request_fields_get_string(fields, "screenname"); |
438 | 440 |
439 gaim_gtkdialogs_new_im(account, username); | 441 gaim_gtkdialogs_im_with_user(account, username); |
440 } | 442 } |
441 | 443 |
442 void | 444 void |
443 gaim_gtkdialogs_im(void) | 445 gaim_gtkdialogs_im(void) |
444 { | 446 { |