diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
| commit | 1d153c1cf91edce537bc64efb01b5a496b35518e (patch) | |
| tree | de8ba4359a0341bd0c8c6e1a7495f4f39fb565f1 /src/empathy-call-window-fullscreen.c | |
| parent | b50b7039d3b52f33df94e5a3526d9f43a51401ad (diff) | |
| parent | 6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6 (diff) | |
| download | gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.gz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.bz2 gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.lz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.xz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.zst gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.zip | |
Merge commit 'upstream/master' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c
Diffstat (limited to 'src/empathy-call-window-fullscreen.c')
| -rw-r--r-- | src/empathy-call-window-fullscreen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c index 33f4085b3..e1c3d7a39 100644 --- a/src/empathy-call-window-fullscreen.c +++ b/src/empathy-call-window-fullscreen.c @@ -71,11 +71,11 @@ empathy_call_window_fullscreen_set_cursor_visible ( if (priv->video_widget != NULL && !show_cursor) { - gdk_window_set_cursor (priv->video_widget->window, + gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), gdk_cursor_new (GDK_BLANK_CURSOR)); } else - gdk_window_set_cursor (priv->video_widget->window, NULL); + gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), NULL); } static void @@ -130,7 +130,7 @@ empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *self) screen = gtk_window_get_screen (GTK_WINDOW (priv->parent_window)); gdk_screen_get_monitor_geometry (screen, gdk_screen_get_monitor_at_window (screen, - GTK_WIDGET (priv->parent_window)->window), + gtk_widget_get_window (GTK_WIDGET (priv->parent_window))), &fullscreen_rect); /* Getting the popup window sizes */ |