pidgin.vv: a04b6e05: Add statusbar to eventually replace the ...
maiku at soc.pidgin.im
maiku at soc.pidgin.im
Mon Feb 2 06:40:30 EST 2009
-----------------------------------------------------------------
Revision: a04b6e057ca2d46a4b8019b1fc01b2393bcc9f8f
Ancestor: a54c98efd24c75ad9c5d515f23bfbb6f1782a388
Author: maiku at soc.pidgin.im
Date: 2009-02-02T11:37:07
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/a04b6e057ca2d46a4b8019b1fc01b2393bcc9f8f
Modified files:
pidgin/gtkmedia.c
ChangeLog:
Add statusbar to eventually replace the label.
-------------- next part --------------
============================================================
--- pidgin/gtkmedia.c 8155fd0d6e2fdddbdd9167b3b90ff667981c8ce9
+++ pidgin/gtkmedia.c a0d4df73e95968bd7733bfa07aafbf2170a59fe7
@@ -57,6 +57,8 @@ struct _PidginMediaPrivate
GstElement *send_level;
GstElement *recv_level;
+ GtkWidget *statusbar;
+
GtkWidget *calling;
GtkWidget *accept;
GtkWidget *reject;
@@ -229,6 +231,13 @@ pidgin_media_init (PidginMedia *media)
vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(media), vbox);
+ media->priv->statusbar = gtk_statusbar_new();
+ gtk_box_pack_end(GTK_BOX(vbox), media->priv->statusbar,
+ FALSE, FALSE, 0);
+ gtk_statusbar_push(GTK_STATUSBAR(media->priv->statusbar),
+ 0, _("Connecting..."));
+ gtk_widget_show(media->priv->statusbar);
+
hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(GTK_WIDGET(hbox));
@@ -402,6 +411,8 @@ pidgin_media_error_cb(PidginMedia *media
if (conv != NULL)
purple_conversation_write(conv, NULL, error,
PURPLE_MESSAGE_ERROR, time(NULL));
+ gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
+ 0, error);
}
static void
@@ -410,6 +421,8 @@ pidgin_media_accepted_cb(PurpleMedia *me
{
pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED);
pidgin_media_emit_message(gtkmedia, _("Call in progress."));
+ gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
+ 0, _("Call in progress."));
gtk_widget_show(GTK_WIDGET(gtkmedia));
}
More information about the Commits
mailing list