comparison: pidgin/gtksound.c
pidgin/gtksound.c
- changeset 38433
- 361c801c4536
- parent 38358
- 30ba44276e74
- child 40315
- 6746d9b67b3e
equal
deleted
inserted
replaced
| 38431:71898cf4d20f | 38433:361c801c4536 |
|---|---|
| 230 */ | 230 */ |
| 231 static void | 231 static void |
| 232 account_signon_cb(PurpleConnection *gc, gpointer data) | 232 account_signon_cb(PurpleConnection *gc, gpointer data) |
| 233 { | 233 { |
| 234 if (mute_login_sounds_timeout != 0) | 234 if (mute_login_sounds_timeout != 0) |
| 235 purple_timeout_remove(mute_login_sounds_timeout); | 235 g_source_remove(mute_login_sounds_timeout); |
| 236 mute_login_sounds = TRUE; | 236 mute_login_sounds = TRUE; |
| 237 mute_login_sounds_timeout = purple_timeout_add_seconds(10, unmute_login_sounds_cb, NULL); | 237 mute_login_sounds_timeout = g_timeout_add_seconds(10, unmute_login_sounds_cb, NULL); |
| 238 } | 238 } |
| 239 | 239 |
| 240 const char * | 240 const char * |
| 241 pidgin_sound_get_event_option(PurpleSoundEventID event) | 241 pidgin_sound_get_event_option(PurpleSoundEventID event) |
| 242 { | 242 { |
| 505 NULL, NULL, &pid, &error)) { | 505 NULL, NULL, &pid, &error)) { |
| 506 purple_debug_error("gtksound", "sound command could not be launched: %s\n", | 506 purple_debug_error("gtksound", "sound command could not be launched: %s\n", |
| 507 error->message); | 507 error->message); |
| 508 g_error_free(error); | 508 g_error_free(error); |
| 509 } else { | 509 } else { |
| 510 purple_timeout_add_seconds(15, expire_old_child, GINT_TO_POINTER(pid)); | 510 g_timeout_add_seconds(15, expire_old_child, GINT_TO_POINTER(pid)); |
| 511 } | 511 } |
| 512 | 512 |
| 513 g_strfreev(argv); | 513 g_strfreev(argv); |
| 514 g_free(esc_filename); | 514 g_free(esc_filename); |
| 515 g_free(command); | 515 g_free(command); |
