Mercurial > pidgin.yaz
comparison pidgin/gtkmedia.c @ 32807:e323c2f84872
merge of '8e3c82b6770042fa4b42cfd0dee9cbcd54ed894a'
and 'e9fceac2dee9c0b9c449263d63857762c7fe7715'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 31 Oct 2011 02:29:25 +0000 |
| parents | 15e80ced77a2 fed510b05c32 |
| children |
comparison
equal
deleted
inserted
replaced
| 32805:064eb5d78946 | 32807:e323c2f84872 |
|---|---|
| 967 if (local == TRUE) | 967 if (local == TRUE) |
| 968 purple_request_close_with_handle(gtkmedia); | 968 purple_request_close_with_handle(gtkmedia); |
| 969 pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED); | 969 pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED); |
| 970 pidgin_media_emit_message(gtkmedia, _("Call in progress.")); | 970 pidgin_media_emit_message(gtkmedia, _("Call in progress.")); |
| 971 gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar), | 971 gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar), |
| 972 0, _("Call in progress.")); | 972 0, _("Call in progress")); |
| 973 gtk_widget_show(GTK_WIDGET(gtkmedia)); | 973 gtk_widget_show(GTK_WIDGET(gtkmedia)); |
| 974 } | 974 } |
| 975 } | 975 } |
| 976 | 976 |
| 977 static void | 977 static void |