Mercurial > pidgin.yaz
comparison pidgin/gtkmedia.c @ 32310:142429bcb4c8
propagate from branch 'im.pidgin.pidgin' (head bb53d1e9201138b79a1eef0d4a7cda1fc852c59f)
to branch 'im.pidgin.pidgin.next.major' (head 85a38af15472bf17064bbe597f94f32ad167c4e6)
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 07 Aug 2011 05:19:54 +0000 |
| parents | 6f503dcd843e |
| children | f21518a8f3b8 fed510b05c32 |
comparison
equal
deleted
inserted
replaced
| 32309:a3b1dcf433b5 | 32310:142429bcb4c8 |
|---|---|
| 536 { | 536 { |
| 537 PidginMediaPrivate *priv = data->gtkmedia->priv; | 537 PidginMediaPrivate *priv = data->gtkmedia->priv; |
| 538 GdkWindow *window = NULL; | 538 GdkWindow *window = NULL; |
| 539 | 539 |
| 540 if (data->participant == NULL) | 540 if (data->participant == NULL) |
| 541 #if GTK_CHECK_VERSION(2, 14, 0) | |
| 541 window = gtk_widget_get_window(priv->local_video); | 542 window = gtk_widget_get_window(priv->local_video); |
| 543 #else | |
| 544 window = (priv->local_video)->window; | |
| 545 #endif | |
| 542 else { | 546 else { |
| 543 GtkWidget *widget = pidgin_media_get_widget(data->gtkmedia, | 547 GtkWidget *widget = pidgin_media_get_widget(data->gtkmedia, |
| 544 data->session_id, data->participant); | 548 data->session_id, data->participant); |
| 545 if (widget) | 549 if (widget) |
| 550 #if GTK_CHECK_VERSION(2, 14, 0) | |
| 546 window = gtk_widget_get_window(widget); | 551 window = gtk_widget_get_window(widget); |
| 552 #else | |
| 553 window = widget->window; | |
| 554 #endif | |
| 547 } | 555 } |
| 548 | 556 |
| 549 if (window) { | 557 if (window) { |
| 550 gulong window_id; | 558 gulong window_id; |
| 551 #ifdef _WIN32 | 559 #ifdef _WIN32 |