aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-02 20:26:11 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-04 17:10:19 +0800
commit726b480efacd222976fe99200598b294ff8686b8 (patch)
treec1fde273fb65431add2bee94054a52ca4ce15e3e /src
parentd89a90c582166d20b9a5c165d5784e434fc1de7f (diff)
downloadgsoc2013-empathy-726b480efacd222976fe99200598b294ff8686b8.tar
gsoc2013-empathy-726b480efacd222976fe99200598b294ff8686b8.tar.gz
gsoc2013-empathy-726b480efacd222976fe99200598b294ff8686b8.tar.bz2
gsoc2013-empathy-726b480efacd222976fe99200598b294ff8686b8.tar.lz
gsoc2013-empathy-726b480efacd222976fe99200598b294ff8686b8.tar.xz
gsoc2013-empathy-726b480efacd222976fe99200598b294ff8686b8.tar.zst
gsoc2013-empathy-726b480efacd222976fe99200598b294ff8686b8.zip
CallWindow: add a 'Call log' menu
https://bugzilla.gnome.org/show_bug.cgi?id=655884
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c46
-rw-r--r--src/empathy-call-window.ui7
2 files changed, 53 insertions, 0 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index bcbadc7e0..2d7d53efd 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -738,6 +738,51 @@ empathy_call_window_contents_cb (GtkAction *action,
}
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,
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 234219103..17ab4754d 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -45,6 +45,12 @@
<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>
<property name="name">menuabout</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>