comparison: pidgin/gtkmedia.c
pidgin/gtkmedia.c
- branch
- soc.2013.gobjectification.plugins
- changeset 37109
- 94d1a2589d5a
- parent 35527
- 707c3c2b2c8a
- child 36089
- c035b9a63457
equal
deleted
inserted
replaced
| 37108:73c5fb6d78b3 | 37109:94d1a2589d5a |
|---|---|
| 329 | 329 |
| 330 #ifdef HAVE_X11 | 330 #ifdef HAVE_X11 |
| 331 XSetErrorHandler(pidgin_x_error_handler); | 331 XSetErrorHandler(pidgin_x_error_handler); |
| 332 #endif | 332 #endif |
| 333 | 333 |
| 334 vbox = gtk_vbox_new(FALSE, 0); | 334 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); |
| 335 gtk_container_add(GTK_CONTAINER(media), vbox); | 335 gtk_container_add(GTK_CONTAINER(media), vbox); |
| 336 | 336 |
| 337 media->priv->statusbar = gtk_statusbar_new(); | 337 media->priv->statusbar = gtk_statusbar_new(); |
| 338 gtk_box_pack_end(GTK_BOX(vbox), media->priv->statusbar, | 338 gtk_box_pack_end(GTK_BOX(vbox), media->priv->statusbar, |
| 339 FALSE, FALSE, 0); | 339 FALSE, FALSE, 0); |
| 343 | 343 |
| 344 media->priv->menubar = setup_menubar(media); | 344 media->priv->menubar = setup_menubar(media); |
| 345 gtk_box_pack_start(GTK_BOX(vbox), media->priv->menubar, | 345 gtk_box_pack_start(GTK_BOX(vbox), media->priv->menubar, |
| 346 FALSE, TRUE, 0); | 346 FALSE, TRUE, 0); |
| 347 | 347 |
| 348 media->priv->display = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 348 media->priv->display = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
| 349 gtk_container_set_border_width(GTK_CONTAINER(media->priv->display), | 349 gtk_container_set_border_width(GTK_CONTAINER(media->priv->display), |
| 350 PIDGIN_HIG_BOX_SPACE); | 350 PIDGIN_HIG_BOX_SPACE); |
| 351 gtk_box_pack_start(GTK_BOX(vbox), media->priv->display, | 351 gtk_box_pack_start(GTK_BOX(vbox), media->priv->display, |
| 352 TRUE, TRUE, PIDGIN_HIG_BOX_SPACE); | 352 TRUE, TRUE, PIDGIN_HIG_BOX_SPACE); |
| 353 gtk_widget_show(vbox); | 353 gtk_widget_show(vbox); |
| 704 "/purple/media/audio/volume/output"); | 704 "/purple/media/audio/volume/output"); |
| 705 } else | 705 } else |
| 706 g_return_val_if_reached(NULL); | 706 g_return_val_if_reached(NULL); |
| 707 | 707 |
| 708 /* Setup widget structure */ | 708 /* Setup widget structure */ |
| 709 volume_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 709 volume_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
| 710 progress_parent = gtk_vbox_new(FALSE, 0); | 710 progress_parent = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); |
| 711 gtk_box_pack_start(GTK_BOX(volume_widget), | 711 gtk_box_pack_start(GTK_BOX(volume_widget), |
| 712 progress_parent, TRUE, TRUE, 0); | 712 progress_parent, TRUE, TRUE, 0); |
| 713 | 713 |
| 714 /* Volume button */ | 714 /* Volume button */ |
| 715 volume = gtk_volume_button_new(); | 715 volume = gtk_volume_button_new(); |
| 753 GdkPixbuf *icon = NULL; | 753 GdkPixbuf *icon = NULL; |
| 754 | 754 |
| 755 if (gtkmedia->priv->recv_widget == NULL | 755 if (gtkmedia->priv->recv_widget == NULL |
| 756 && type & (PURPLE_MEDIA_RECV_VIDEO | | 756 && type & (PURPLE_MEDIA_RECV_VIDEO | |
| 757 PURPLE_MEDIA_RECV_AUDIO)) { | 757 PURPLE_MEDIA_RECV_AUDIO)) { |
| 758 recv_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 758 recv_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE); |
| 759 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display), | 759 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display), |
| 760 recv_widget, TRUE, TRUE, 0); | 760 recv_widget, TRUE, TRUE, 0); |
| 761 gtk_widget_show(recv_widget); | 761 gtk_widget_show(recv_widget); |
| 762 } else { | 762 } else { |
| 763 recv_widget = gtkmedia->priv->recv_widget; | 763 recv_widget = gtkmedia->priv->recv_widget; |
| 764 } | 764 } |
| 765 if (gtkmedia->priv->send_widget == NULL | 765 if (gtkmedia->priv->send_widget == NULL |
| 766 && type & (PURPLE_MEDIA_SEND_VIDEO | | 766 && type & (PURPLE_MEDIA_SEND_VIDEO | |
| 767 PURPLE_MEDIA_SEND_AUDIO)) { | 767 PURPLE_MEDIA_SEND_AUDIO)) { |
| 768 send_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 768 send_widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE); |
| 769 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display), | 769 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display), |
| 770 send_widget, FALSE, TRUE, 0); | 770 send_widget, FALSE, TRUE, 0); |
| 771 button_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 771 button_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
| 772 gtk_box_pack_end(GTK_BOX(recv_widget), button_widget, | 772 gtk_box_pack_end(GTK_BOX(recv_widget), button_widget, |
| 773 FALSE, TRUE, 0); | 773 FALSE, TRUE, 0); |
| 774 gtk_widget_show(send_widget); | 774 gtk_widget_show(send_widget); |
| 775 | 775 |
| 776 /* Hold button */ | 776 /* Hold button */ |
