comparison: pidgin/gtkmedia.c
pidgin/gtkmedia.c
- branch
- vv
- changeset 26285
- da0d636d494a
- parent 26284
- 5d36c99b8f2d
- child 26287
- c0cdd840a828
equal
deleted
inserted
replaced
| 26284:5d36c99b8f2d | 26285:da0d636d494a |
|---|---|
| 55 PurpleMedia *media; | 55 PurpleMedia *media; |
| 56 gchar *screenname; | 56 gchar *screenname; |
| 57 GstElement *send_level; | 57 GstElement *send_level; |
| 58 GstElement *recv_level; | 58 GstElement *recv_level; |
| 59 | 59 |
| 60 GtkWidget *statusbar; | |
| 61 | |
| 60 GtkWidget *calling; | 62 GtkWidget *calling; |
| 61 GtkWidget *accept; | 63 GtkWidget *accept; |
| 62 GtkWidget *reject; | 64 GtkWidget *reject; |
| 63 GtkWidget *hangup; | 65 GtkWidget *hangup; |
| 64 GtkWidget *mute; | 66 GtkWidget *mute; |
| 227 XSetErrorHandler(pidgin_x_error_handler); | 229 XSetErrorHandler(pidgin_x_error_handler); |
| 228 | 230 |
| 229 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 231 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 230 gtk_container_add(GTK_CONTAINER(media), vbox); | 232 gtk_container_add(GTK_CONTAINER(media), vbox); |
| 231 | 233 |
| 234 media->priv->statusbar = gtk_statusbar_new(); | |
| 235 gtk_box_pack_end(GTK_BOX(vbox), media->priv->statusbar, | |
| 236 FALSE, FALSE, 0); | |
| 237 gtk_statusbar_push(GTK_STATUSBAR(media->priv->statusbar), | |
| 238 0, _("Connecting...")); | |
| 239 gtk_widget_show(media->priv->statusbar); | |
| 240 | |
| 232 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 241 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 233 gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); | 242 gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
| 234 gtk_widget_show(GTK_WIDGET(hbox)); | 243 gtk_widget_show(GTK_WIDGET(hbox)); |
| 235 | 244 |
| 236 media->priv->calling = gtk_label_new("Calling..."); | 245 media->priv->calling = gtk_label_new("Calling..."); |
| 400 PURPLE_CONV_TYPE_ANY, gtkmedia->priv->screenname, | 409 PURPLE_CONV_TYPE_ANY, gtkmedia->priv->screenname, |
| 401 purple_connection_get_account(gtkmedia->priv->pc)); | 410 purple_connection_get_account(gtkmedia->priv->pc)); |
| 402 if (conv != NULL) | 411 if (conv != NULL) |
| 403 purple_conversation_write(conv, NULL, error, | 412 purple_conversation_write(conv, NULL, error, |
| 404 PURPLE_MESSAGE_ERROR, time(NULL)); | 413 PURPLE_MESSAGE_ERROR, time(NULL)); |
| 414 gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar), | |
| 415 0, error); | |
| 405 } | 416 } |
| 406 | 417 |
| 407 static void | 418 static void |
| 408 pidgin_media_accepted_cb(PurpleMedia *media, const gchar *session_id, | 419 pidgin_media_accepted_cb(PurpleMedia *media, const gchar *session_id, |
| 409 const gchar *participant, PidginMedia *gtkmedia) | 420 const gchar *participant, PidginMedia *gtkmedia) |
| 410 { | 421 { |
| 411 pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED); | 422 pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED); |
| 412 pidgin_media_emit_message(gtkmedia, _("Call in progress.")); | 423 pidgin_media_emit_message(gtkmedia, _("Call in progress.")); |
| 424 gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar), | |
| 425 0, _("Call in progress.")); | |
| 413 gtk_widget_show(GTK_WIDGET(gtkmedia)); | 426 gtk_widget_show(GTK_WIDGET(gtkmedia)); |
| 414 } | 427 } |
| 415 | 428 |
| 416 static gboolean | 429 static gboolean |
| 417 plug_delete_event_cb(GtkWidget *widget, gpointer data) | 430 plug_delete_event_cb(GtkWidget *widget, gpointer data) |
