aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-02-03 17:02:36 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-03 17:02:36 +0800
commitcbc58090d94638c121b54dfbd9c9829323675e2a (patch)
treec081572b595904a333ac53e63d87d383cd4ca6d1 /src
parent579b8dd725b4a831a991d55f1f5c4ddeda9ced66 (diff)
downloadgsoc2013-empathy-cbc58090d94638c121b54dfbd9c9829323675e2a.tar
gsoc2013-empathy-cbc58090d94638c121b54dfbd9c9829323675e2a.tar.gz
gsoc2013-empathy-cbc58090d94638c121b54dfbd9c9829323675e2a.tar.bz2
gsoc2013-empathy-cbc58090d94638c121b54dfbd9c9829323675e2a.tar.lz
gsoc2013-empathy-cbc58090d94638c121b54dfbd9c9829323675e2a.tar.xz
gsoc2013-empathy-cbc58090d94638c121b54dfbd9c9829323675e2a.tar.zst
gsoc2013-empathy-cbc58090d94638c121b54dfbd9c9829323675e2a.zip
Initial port from telepathy-stream-engine to telepathy-farsight
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2380
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c3
-rw-r--r--src/empathy.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 77f850866..34f5fd202 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -352,6 +352,9 @@ call_window_update (EmpathyCallWindow *window)
gboolean is_incoming;
gchar *title;
+ if (window->call == NULL)
+ return;
+
g_object_get (window->call,
"status", &window->status,
"audio-stream", &audio_stream,
diff --git a/src/empathy.c b/src/empathy.c
index b67e69878..dce928701 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -62,6 +62,8 @@
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include <libempathy/empathy-debug.h>
+#include <gst/gst.h>
+
static BaconMessageConnection *connection = NULL;
static void
@@ -441,6 +443,10 @@ main (int argc, char *argv[])
empathy_gtk_init ();
g_set_application_name (_(PACKAGE_NAME));
+
+ gst_init (&argc, &argv);
+
+ g_set_application_name (PACKAGE_NAME);
gtk_window_set_default_icon_name ("empathy");
textdomain (GETTEXT_PACKAGE);