]> git.0d.be Git - empathy.git/commitdiff
CallWindow: add a 'Call log' menu
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Tue, 2 Aug 2011 12:26:11 +0000 (13:26 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 4 Aug 2011 09:10:19 +0000 (10:10 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=655884

src/empathy-call-window.c
src/empathy-call-window.ui

index bcbadc7e0b29de73f1bc1ebd027376daa978c7e4..2d7d53efd76a04633ac175b526f5b5e8dcfd7d9b 100644 (file)
@@ -737,6 +737,51 @@ empathy_call_window_contents_cb (GtkAction *action,
   empathy_url_show (GTK_WIDGET (self), "ghelp:empathy?audio-video");
 }
 
+static void
+empathy_call_window_debug_cb (GtkAction *action,
+    EmpathyCallWindow *self)
+{
+  GdkDisplay *display;
+  GError *error = NULL;
+  gchar *path;
+  GAppInfo *app_info;
+  GdkAppLaunchContext *context = NULL;
+
+  /* Try to run from source directory if possible */
+  path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "src",
+      "empathy-debugger", NULL);
+
+  if (!g_file_test (path, G_FILE_TEST_EXISTS))
+    {
+      g_free (path);
+      path = g_build_filename (BIN_DIR, "empathy-debugger", NULL);
+    }
+
+  app_info = g_app_info_create_from_commandline (path, NULL, 0, &error);
+  if (app_info == NULL)
+    {
+      DEBUG ("Failed to create app info: %s", error->message);
+      g_error_free (error);
+      goto out;
+    }
+
+  display = gdk_display_get_default ();
+  context = gdk_display_get_app_launch_context (display);
+
+  if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
+      &error))
+    {
+      g_warning ("Failed to open debug window: %s", error->message);
+      g_error_free (error);
+      goto out;
+    }
+
+out:
+  tp_clear_object (&app_info);
+  tp_clear_object (&context);
+  g_free (path);
+}
+
 static void
 empathy_call_window_about_cb (GtkAction *action,
     EmpathyCallWindow *self)
@@ -839,6 +884,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
     "dialpad", "toggled", empathy_call_window_dialpad_cb,
     "menufullscreen", "activate", empathy_call_window_fullscreen_cb,
     "menucontents", "activate", empathy_call_window_contents_cb,
+    "menudebug", "activate", empathy_call_window_debug_cb,
     "menuabout", "activate", empathy_call_window_about_cb,
     "menupreviewdisable", "activate", empathy_call_window_disable_camera_cb,
     "menupreviewminimise", "activate", empathy_call_window_minimise_camera_cb,
index 2342191036f74bfdc45fb314a0700218cb71c57b..17ab4754d40e10eec78aa007bf90cef114458b10 100644 (file)
           </object>
           <accelerator key="F1" modifiers=""/>
         </child>
+        <child>
+          <object class="GtkAction" id="menudebug">
+            <property name="name">menudebug</property>
+            <property name="label" translatable="yes">_Debug</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="menuabout">
             <property name="stock_id">gtk-about</property>
@@ -80,6 +86,7 @@
         </menu>
         <menu action="help">
           <menuitem name="menucontents" action="menucontents"/>
+          <menuitem name="menudebug" action="menudebug"/>
           <menuitem name="menuabout" action="menuabout"/>
         </menu>
       </menubar>