comparison: pidgin/plugins/musicmessaging/musicmessaging.c
pidgin/plugins/musicmessaging/musicmessaging.c
- changeset 34449
- bbcb198650b7
- parent 34292
- 30107eb2ff81
- child 34477
- 86f6c431da7b
- child 34955
- 854143116575
equal
deleted
inserted
replaced
| 34448:e15d91a77cb3 | 34449:bbcb198650b7 |
|---|---|
| 143 void music_messaging_change_failed(const int session, const char *id, const char *command, const char *parameters) | 143 void music_messaging_change_failed(const int session, const char *id, const char *command, const char *parameters) |
| 144 { | 144 { |
| 145 MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); | 145 MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); |
| 146 | 146 |
| 147 purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_INFO, command, | 147 purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_INFO, command, |
| 148 parameters, NULL, NULL, NULL); | 148 parameters, NULL, NULL, NULL, NULL); |
| 149 | 149 |
| 150 if (mmconv->started) | 150 if (mmconv->started) |
| 151 { | 151 { |
| 152 if (mmconv->originator) | 152 if (mmconv->originator) |
| 153 { | 153 { |
| 165 void music_messaging_done_session(const int session) | 165 void music_messaging_done_session(const int session) |
| 166 { | 166 { |
| 167 MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); | 167 MMConversation *mmconv = (MMConversation *)g_list_nth_data(conversations, session); |
| 168 | 168 |
| 169 purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_INFO, "Session", | 169 purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_INFO, "Session", |
| 170 "Session Complete", NULL, NULL, NULL); | 170 "Session Complete", NULL, NULL, NULL, NULL); |
| 171 | 171 |
| 172 session_end(mmconv); | 172 session_end(mmconv); |
| 173 } | 173 } |
| 174 | 174 |
| 175 | 175 |
| 427 // TODO: Shouldn't this be strcmp() ? | 427 // TODO: Shouldn't this be strcmp() ? |
| 428 if (purple_conversation_get_name(mmconv->conv) == id) | 428 if (purple_conversation_get_name(mmconv->conv) == id) |
| 429 { | 429 { |
| 430 purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_ERROR, | 430 purple_notify_message(plugin_pointer, PURPLE_NOTIFY_MSG_ERROR, |
| 431 _("Music Messaging"), | 431 _("Music Messaging"), |
| 432 _("There was a conflict in running the command:"), command, NULL, NULL); | 432 _("There was a conflict in running the command:"), command, NULL, NULL, NULL); |
| 433 } | 433 } |
| 434 } | 434 } |
| 435 } | 435 } |
| 436 | 436 |
| 437 message = 0; | 437 message = 0; |
| 536 args[3] = NULL; | 536 args[3] = NULL; |
| 537 | 537 |
| 538 if (!(g_spawn_async (".", args, NULL, 4, NULL, NULL, &(mmconv->pid), &spawn_error))) | 538 if (!(g_spawn_async (".", args, NULL, 4, NULL, NULL, &(mmconv->pid), &spawn_error))) |
| 539 { | 539 { |
| 540 purple_notify_error(plugin_pointer, _("Error Running Editor"), | 540 purple_notify_error(plugin_pointer, _("Error Running Editor"), |
| 541 _("The following error has occurred:"), spawn_error->message); | 541 _("The following error has occurred:"), spawn_error->message, NULL); |
| 542 mmconv->started = FALSE; | 542 mmconv->started = FALSE; |
| 543 } | 543 } |
| 544 else | 544 else |
| 545 { | 545 { |
| 546 mmconv->started = TRUE; | 546 mmconv->started = TRUE; |
