Mercurial > pidgin
diff pidgin/gtkmedia.c @ 26048:525aa65805b9
Rearrange the Pidgin media GUI.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 14 Jan 2009 09:20:07 +0000 |
| parents | 958a5d614f71 |
| children | 6eeb500ce9a2 |
line wrap: on
line diff
--- a/pidgin/gtkmedia.c Tue Jan 13 13:46:06 2009 +0000 +++ b/pidgin/gtkmedia.c Wed Jan 14 09:20:07 2009 +0000 @@ -120,7 +120,7 @@ (GInstanceInitFunc) pidgin_media_init, NULL }; - type = g_type_register_static(GTK_TYPE_HBOX, "PidginMedia", &info, 0); + type = g_type_register_static(GTK_TYPE_VBOX, "PidginMedia", &info, 0); } return type; } @@ -195,11 +195,11 @@ g_signal_connect(media->priv->mute, "toggled", G_CALLBACK(pidgin_media_mute_toggled), media); - gtk_box_pack_start(GTK_BOX(media), media->priv->calling, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(media), media->priv->hangup, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(media), media->priv->accept, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(media), media->priv->reject, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(media), media->priv->reject, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(media), media->priv->accept, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(media), media->priv->hangup, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(media), media->priv->mute, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(media), media->priv->calling, FALSE, FALSE, 0); gtk_widget_show_all(media->priv->accept); gtk_widget_show_all(media->priv->reject); @@ -307,11 +307,6 @@ PidginMedia *gtkmedia = PIDGIN_MEDIA(media); purple_debug_info("gtkmedia", "pidgin_media_finalize\n"); - if (gtkmedia->priv->display) { - gtk_widget_destroy(gtkmedia->priv->display); - gtkmedia->priv->display = NULL; - } - G_OBJECT_CLASS(parent_class)->finalize(media); }