diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-09 22:24:21 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-09 22:24:21 +0800 |
| commit | d121d6a9b9d4d3a654dfd2b0e900be216f161dba (patch) | |
| tree | 0a7b612abcd2035cd0d7f56008f8e95f05e00ce7 /src | |
| parent | 9129f3e31d22e7b375f3c90fd2e89e05f5e564eb (diff) | |
| parent | 8c83da990d4791fc91b52856536c3d05f59bc832 (diff) | |
| download | gsoc2013-empathy-d121d6a9b9d4d3a654dfd2b0e900be216f161dba.tar gsoc2013-empathy-d121d6a9b9d4d3a654dfd2b0e900be216f161dba.tar.gz gsoc2013-empathy-d121d6a9b9d4d3a654dfd2b0e900be216f161dba.tar.bz2 gsoc2013-empathy-d121d6a9b9d4d3a654dfd2b0e900be216f161dba.tar.lz gsoc2013-empathy-d121d6a9b9d4d3a654dfd2b0e900be216f161dba.tar.xz gsoc2013-empathy-d121d6a9b9d4d3a654dfd2b0e900be216f161dba.tar.zst gsoc2013-empathy-d121d6a9b9d4d3a654dfd2b0e900be216f161dba.zip | |
Merge branch 'gnome-3-8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-debug-window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 9c9c5c3ab..e4f5e21d6 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -376,7 +376,7 @@ debug_window_get_messages_cb (GObject *object, messages = tp_debug_client_get_messages_finish (debug, result, &error); if (messages == NULL) { - DEBUG ("Failed to get debug messsages: %s", error->message); + DEBUG ("Failed to get debug messages: %s", error->message); g_error_free (error); /* We want to set the window sensitivity to false only when proxy for the |