comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 16263
- 27e0ef0f38e6
- parent 16254
- eeb2bba4dc94
- child 16291
- acbfc9276da1
equal
deleted
inserted
replaced
| 16262:1d9b65303dfc | 16263:27e0ef0f38e6 |
|---|---|
| 624 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { | 624 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { |
| 625 PurpleBuddy *b; | 625 PurpleBuddy *b; |
| 626 | 626 |
| 627 b = purple_find_buddy(account, name); | 627 b = purple_find_buddy(account, name); |
| 628 if (b != NULL) | 628 if (b != NULL) |
| 629 pidgindialogs_remove_buddy(b); | 629 pidgin_dialogs_remove_buddy(b); |
| 630 else if (account != NULL && purple_account_is_connected(account)) | 630 else if (account != NULL && purple_account_is_connected(account)) |
| 631 purple_blist_request_add_buddy(account, (char *)name, NULL, NULL); | 631 purple_blist_request_add_buddy(account, (char *)name, NULL, NULL); |
| 632 } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { | 632 } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { |
| 633 PurpleChat *c; | 633 PurpleChat *c; |
| 634 | 634 |
| 635 c = purple_blist_find_chat(account, name); | 635 c = purple_blist_find_chat(account, name); |
| 636 if (c != NULL) | 636 if (c != NULL) |
| 637 pidgindialogs_remove_chat(c); | 637 pidgin_dialogs_remove_chat(c); |
| 638 else if (account != NULL && purple_account_is_connected(account)) | 638 else if (account != NULL && purple_account_is_connected(account)) |
| 639 purple_blist_request_add_chat(account, NULL, NULL, name); | 639 purple_blist_request_add_chat(account, NULL, NULL, name); |
| 640 } | 640 } |
| 641 | 641 |
| 642 gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry); | 642 gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry); |
| 966 } | 966 } |
| 967 | 967 |
| 968 static void | 968 static void |
| 969 menu_new_conv_cb(gpointer data, guint action, GtkWidget *widget) | 969 menu_new_conv_cb(gpointer data, guint action, GtkWidget *widget) |
| 970 { | 970 { |
| 971 pidgindialogs_im(); | 971 pidgin_dialogs_im(); |
| 972 } | 972 } |
| 973 | 973 |
| 974 static void | 974 static void |
| 975 savelog_writefile_cb(void *user_data, const char *filename) | 975 savelog_writefile_cb(void *user_data, const char *filename) |
| 976 { | 976 { |
| 1237 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { | 1237 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { |
| 1238 PurpleBuddy *b; | 1238 PurpleBuddy *b; |
| 1239 | 1239 |
| 1240 b = purple_find_buddy(account, name); | 1240 b = purple_find_buddy(account, name); |
| 1241 if (b != NULL) | 1241 if (b != NULL) |
| 1242 pidgindialogs_alias_buddy(b); | 1242 pidgin_dialogs_alias_buddy(b); |
| 1243 } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { | 1243 } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { |
| 1244 PurpleChat *c; | 1244 PurpleChat *c; |
| 1245 | 1245 |
| 1246 c = purple_blist_find_chat(account, name); | 1246 c = purple_blist_find_chat(account, name); |
| 1247 if (c != NULL) | 1247 if (c != NULL) |
| 1248 pidgindialogs_alias_chat(c); | 1248 pidgin_dialogs_alias_chat(c); |
| 1249 } | 1249 } |
| 1250 } | 1250 } |
| 1251 | 1251 |
| 1252 static void | 1252 static void |
| 1253 menu_get_info_cb(gpointer data, guint action, GtkWidget *widget) | 1253 menu_get_info_cb(gpointer data, guint action, GtkWidget *widget) |
| 1409 real_who = g_strdup(who); | 1409 real_who = g_strdup(who); |
| 1410 | 1410 |
| 1411 if(!real_who) | 1411 if(!real_who) |
| 1412 return; | 1412 return; |
| 1413 | 1413 |
| 1414 pidgindialogs_im_with_user(account, real_who); | 1414 pidgin_dialogs_im_with_user(account, real_who); |
| 1415 | 1415 |
| 1416 g_free(real_who); | 1416 g_free(real_who); |
| 1417 } | 1417 } |
| 1418 | 1418 |
| 1419 static void | 1419 static void |
| 1524 account = purple_conversation_get_account(conv); | 1524 account = purple_conversation_get_account(conv); |
| 1525 name = g_object_get_data(G_OBJECT(w), "user_data"); | 1525 name = g_object_get_data(G_OBJECT(w), "user_data"); |
| 1526 b = purple_find_buddy(account, name); | 1526 b = purple_find_buddy(account, name); |
| 1527 | 1527 |
| 1528 if (b != NULL) | 1528 if (b != NULL) |
| 1529 pidgindialogs_remove_buddy(b); | 1529 pidgin_dialogs_remove_buddy(b); |
| 1530 else if (account != NULL && purple_account_is_connected(account)) | 1530 else if (account != NULL && purple_account_is_connected(account)) |
| 1531 purple_blist_request_add_buddy(account, name, NULL, NULL); | 1531 purple_blist_request_add_buddy(account, name, NULL, NULL); |
| 1532 | 1532 |
| 1533 gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry); | 1533 gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry); |
| 1534 } | 1534 } |
| 5695 if (!conv || !smile || !*smile) { | 5695 if (!conv || !smile || !*smile) { |
| 5696 return FALSE; | 5696 return FALSE; |
| 5697 } | 5697 } |
| 5698 | 5698 |
| 5699 /* If smileys are off, return false */ | 5699 /* If smileys are off, return false */ |
| 5700 if (pidginthemes_smileys_disabled()) | 5700 if (pidgin_themes_smileys_disabled()) |
| 5701 return FALSE; | 5701 return FALSE; |
| 5702 | 5702 |
| 5703 /* If possible add this smiley to the current theme. | 5703 /* If possible add this smiley to the current theme. |
| 5704 * The addition is only temporary: custom smilies aren't saved to disk. */ | 5704 * The addition is only temporary: custom smilies aren't saved to disk. */ |
| 5705 conv_sml = purple_account_get_protocol_name(conv->account); | 5705 conv_sml = purple_account_get_protocol_name(conv->account); |
| 6022 topic ? topic : "", NULL); | 6022 topic ? topic : "", NULL); |
| 6023 } | 6023 } |
| 6024 } | 6024 } |
| 6025 | 6025 |
| 6026 if (fields & PIDGIN_CONV_SMILEY_THEME) | 6026 if (fields & PIDGIN_CONV_SMILEY_THEME) |
| 6027 pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml); | 6027 pidgin_themes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml); |
| 6028 | 6028 |
| 6029 if ((fields & PIDGIN_CONV_COLORIZE_TITLE) || | 6029 if ((fields & PIDGIN_CONV_COLORIZE_TITLE) || |
| 6030 (fields & PIDGIN_CONV_SET_TITLE)) | 6030 (fields & PIDGIN_CONV_SET_TITLE)) |
| 6031 { | 6031 { |
| 6032 char *title; | 6032 char *title; |
