Use double quotes for all internal headers

[empathy.git] / src / empathy-call-window-fullscreen.c

diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index e1c3d7a391a100605a420975f36d52626a7c3460..b678c0a423d3c3769257ab6efcf08d632fab9e0c 100644 (file)
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -1,6 +1,6 @@
 /*
  * empathy-call-window-fullscreen.c - Source for EmpathyCallWindowFullscreen
- * Copyright (C) 2009 Collabora Ltd.
+ * Copyright (C) 2009-2011 Collabora Ltd.
  *
  * Some code is based on the Totem Movie Player, especially
  * totem-fullscreen.c which has the following copyright:
@@ -24,10 +24,8 @@
 
 #include "empathy-call-window-fullscreen.h"
 
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 /* The number of seconds for which the "leave fullscreen" popup should
    be shown */
@@ -68,14 +66,17 @@ empathy_call_window_fullscreen_set_cursor_visible (
     gboolean show_cursor)
 {
   EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (fs);
+  GdkWindow *window;
 
-  if (priv->video_widget != NULL && !show_cursor)
-    {
-      gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget),
-          gdk_cursor_new (GDK_BLANK_CURSOR));
-    }
+  if (priv->video_widget == NULL)
+    return;
+
+  window = gtk_widget_get_window (priv->video_widget);
+
+  if (!show_cursor)
+    gdk_window_set_cursor (window, gdk_cursor_new (GDK_BLANK_CURSOR));
   else
-    gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), NULL);
+    gdk_window_set_cursor (window, NULL);
 }
 
 static void
@@ -284,6 +285,15 @@ empathy_call_window_fullscreen_set_fullscreen (EmpathyCallWindowFullscreen *fs,
   fs->is_fullscreen = set_fullscreen;
 }
 
+static void
+video_widget_destroy_cb (GtkWidget *widget,
+    EmpathyCallWindowFullscreen *self)
+{
+  EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (self);
+
+  priv->video_widget = NULL;
+}
+
 void
 empathy_call_window_fullscreen_set_video_widget (
     EmpathyCallWindowFullscreen *fs,
@@ -291,4 +301,7 @@ empathy_call_window_fullscreen_set_video_widget (
 {
   EmpathyCallWindowFullscreenPriv *priv = GET_PRIV (fs);
   priv->video_widget = video_widget;
+
+  tp_g_signal_connect_object (video_widget, "destroy",
+      G_CALLBACK (video_widget_destroy_cb), fs, 0);
 }