Use a flat namespace for internal includes

[empathy.git] / src / empathy-camera-menu.c

diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index b38cc5f1d0c64831271671f971b0fa543b1389c3..0674e7076cc5a576cac92ce01263671da015c281 100644 (file)
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -19,17 +19,15 @@
  * Thanks guys!
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
 
 #include "empathy-camera-menu.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyCameraMenuPrivate
 {
@@ -132,29 +130,48 @@ empathy_camera_menu_activate_cb (GtkAction *action,
 {
   EmpathyGstVideoSrc *video;
   const gchar *device;
+  gchar *current_device = NULL;
 
   if (self->priv->in_update)
     return;
 
   video = empathy_call_window_get_video_src (self->priv->window);
+  if (video != NULL)
+    current_device = empathy_video_src_dup_device (video);
 
   device = gtk_action_get_name (action);
 
-  empathy_video_src_change_device (video, device);
+  /* Don't change the device if it's the currently used one */
+  if (!tp_strdiff (device, current_device))
+    goto out;
+
+  empathy_call_window_change_webcam (self->priv->window, device);
+
+ out:
+  g_free (current_device);
 }
 
 static void
 empathy_camera_menu_update (EmpathyCameraMenu *self)
 {
   GList *l;
+  GtkAction *menu;
   GtkUIManager *ui_manager;
   EmpathyGstVideoSrc *video;
-  gchar *current_camera;
+  gboolean show_menu;
+  gchar *current_camera = NULL;
+  guint n_cameras;
 
   ui_manager = empathy_call_window_get_ui_manager (self->priv->window);
 
+  menu = gtk_ui_manager_get_action (ui_manager, "/menubar1/edit/menucamera");
+  n_cameras = g_queue_get_length (self->priv->cameras);
+  show_menu = (n_cameras > 1);
+  gtk_action_set_visible (menu, show_menu);
+
   video = empathy_call_window_get_video_src (self->priv->window);
-  current_camera = empathy_video_src_dup_device (video);
+  if (video != NULL)
+    current_camera = empathy_video_src_dup_device (video);
 
   empathy_camera_menu_clean (self);
   self->priv->ui_id = gtk_ui_manager_new_merge_id (ui_manager);
@@ -246,7 +263,7 @@ empathy_camera_menu_prefs_camera_changed_cb (GSettings *settings,
     EmpathyCameraMenu *self)
 {
   gchar *device = g_settings_get_string (settings, key);
-  GtkRadioAction *action;
+  GtkRadioAction *action = NULL;
   gboolean found = FALSE;
   GList *l;
 
@@ -266,10 +283,11 @@ empathy_camera_menu_prefs_camera_changed_cb (GSettings *settings,
 
   /* If the selected camera isn't found, we connect the first
    * available one */
-  if (!found)
+  if (!found && self->priv->cameras->head != NULL)
     action = self->priv->cameras->head->data;
 
-  if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
+  if (action != NULL &&
+      !gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
     {
       g_signal_handlers_block_by_func (settings,
           empathy_camera_menu_prefs_camera_changed_cb, self);
@@ -384,3 +402,17 @@ empathy_camera_menu_new (EmpathyCallWindow *window)
       "window", window,
       NULL);
 }
+
+void
+empathy_camera_menu_set_sensitive (EmpathyCameraMenu *self,
+    gboolean sensitive)
+{
+  GtkUIManager *ui_manager;
+
+  gtk_action_group_set_sensitive (self->priv->action_group, sensitive);
+  if (sensitive) /* Mark the active camera as such. */
+    empathy_camera_menu_update (self);
+
+  ui_manager = empathy_call_window_get_ui_manager (self->priv->window);
+  gtk_ui_manager_ensure_update (ui_manager);
+}