Updated Swedish translation

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

diff --git a/src/empathy-call.c b/src/empathy-call.c
index 2ff49a81b7dbd541c1263146227ec053617694f1..991904108601398067afb74c89c72777b50fbfd6 100644 (file)
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -20,40 +20,32 @@
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <clutter/clutter.h>
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <telepathy-glib/debug-sender.h>
-
-#include <telepathy-yell/telepathy-yell.h>
-
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
+#ifdef CLUTTER_WINDOWING_X11
+#include <X11/Xlib.h>
+#endif
 
-#include "empathy-call-window.h"
+#include "empathy-bus-names.h"
 #include "empathy-call-factory.h"
+#include "empathy-call-window.h"
+#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
-
-#include <gst/gst.h>
+#include "empathy-debug.h"
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
 
-#define EMPATHY_CALL_DBUS_NAME "org.gnome.Empathy.Call"
-
 static GtkApplication *app = NULL;
 static gboolean activated = FALSE;
 static gboolean use_timer = TRUE;
+static guint inhibit_id = 0;
 
 static EmpathyCallFactory *call_factory = NULL;
 
@@ -87,7 +79,7 @@ find_window_for_handle (gpointer key,
 static gboolean
 incoming_call_cb (EmpathyCallFactory *factory,
     guint handle,
-    TpyCallChannel *channel,
+    TpCallChannel *channel,
     TpChannelDispatchOperation *dispatch_operation,
     TpAddDispatchOperationContext *context,
     gpointer user_data)
@@ -106,24 +98,55 @@ incoming_call_cb (EmpathyCallFactory *factory,
   return FALSE;
 }
 
+static void
+call_window_inhibit_cb (EmpathyCallWindow *window,
+    gboolean inhibit,
+    gpointer user_data)
+{
+  if (inhibit)
+    {
+      if (inhibit_id != 0)
+        return;
+
+      inhibit_id = gtk_application_inhibit (GTK_APPLICATION (app),
+          GTK_WINDOW (window),
+          GTK_APPLICATION_INHIBIT_LOGOUT | GTK_APPLICATION_INHIBIT_SWITCH |
+          GTK_APPLICATION_INHIBIT_SUSPEND | GTK_APPLICATION_INHIBIT_IDLE,
+          _("In a call"));
+    }
+  else
+    {
+      if (inhibit_id == 0)
+        return;
+
+      gtk_application_uninhibit (GTK_APPLICATION (app), inhibit_id);
+      inhibit_id = 0;
+    }
+}
+
 static void
 new_call_handler_cb (EmpathyCallFactory *factory,
     EmpathyCallHandler *handler,
-    gboolean outgoing,
+    gint64 user_action_time,
     gpointer user_data)
 {
   EmpathyCallWindow *window;
   EmpathyContact *contact;
+  guint32 x11_time;
+  gboolean present;
 
   DEBUG ("Show the call window");
 
-  g_object_get (handler, "target-contact", &contact, NULL);
+  contact = empathy_call_handler_get_contact (handler);
 
   window = g_hash_table_lookup (call_windows, contact);
 
+  present = tp_user_action_time_should_present (user_action_time,
+      &x11_time);
+
   if (window != NULL)
     {
-      empathy_call_window_present (window, handler);
+      empathy_call_window_new_handler (window, handler, present, x11_time);
     }
   else
     {
@@ -133,8 +156,13 @@ new_call_handler_cb (EmpathyCallFactory *factory,
       g_application_hold (G_APPLICATION (app));
       g_signal_connect (window, "destroy",
           G_CALLBACK (call_window_destroyed_cb), contact);
+      g_signal_connect (window, "inhibit",
+          G_CALLBACK (call_window_inhibit_cb), NULL);
 
       gtk_widget_show (GTK_WIDGET (window));
+
+      if (present)
+        tpaw_window_present_with_time (GTK_WINDOW (window), x11_time);
     }
 }
 
@@ -184,11 +212,13 @@ main (int argc,
   gint retval;
   GtkSettings *gtk_settings;
 
-  /* Init */
-  g_thread_init (NULL);
+  g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE);
 
-  /* Clutter needs this */
-  gdk_disable_multidevice ();
+#ifdef GDK_WINDOWING_X11
+  /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice
+   * but to intiialise X11 threading ourself */
+  XInitThreads ();
+#endif
 
   optcontext = g_option_context_new (N_("- Empathy Audio/Video Client"));
   g_option_context_add_group (optcontext, gst_init_get_option_group ());
@@ -198,6 +228,7 @@ main (int argc,
       clutter_get_option_group_without_init ());
   g_option_context_add_group (optcontext, gtk_clutter_get_option_group ());
   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+  g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
   if (!g_option_context_parse (optcontext, &argc, &argv, &error)) {
     g_print ("%s\nRun '%s --help' to see a full list of available command "
@@ -209,24 +240,21 @@ main (int argc,
 
   g_option_context_free (optcontext);
 
-  tpy_cli_init ();
-
-  gtk_clutter_init (&argc, &argv);
   clutter_gst_init (&argc, &argv);
 
   empathy_gtk_init ();
+  textdomain (GETTEXT_PACKAGE);
   g_set_application_name (_("Empathy Audio/Video Client"));
 
   /* Make empathy and empathy-call appear as the same app in gnome-shell */
   gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
-  textdomain (GETTEXT_PACKAGE);
 
   gtk_settings = gtk_settings_get_default ();
   g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme",
       TRUE, NULL);
 
-  app = gtk_application_new (EMPATHY_CALL_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new (EMPATHY_CALL_BUS_NAME, G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
 #ifdef ENABLE_DEBUG