Merge branch 'gnome-3-8'

Conflicts:
	libempathy/empathy-keyring.c

diff --combined src/empathy-debug-window.c
index fcf5804d486fc778271e016d8118dbd444e1c695,948b9ef7525aaec0d77fde7e0939471eef853197..9c9c5c3ab5a958f7d5476375d50f00152bb9b042
--- 1/src/empathy-debug-window.c
--- 2/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@@ -20,18 -20,18 +20,18 @@@
  */
  
  #include "config.h"
 +#include "empathy-debug-window.h"
  
  #include <glib/gi18n.h>
  #include <libsoup/soup.h>
 +#include <tp-account-widgets/tpaw-utils.h>
  
 -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 -#include <libempathy/empathy-debug.h>
 -#include <libempathy/empathy-utils.h>
 -
 -#include <libempathy-gtk/empathy-geometry.h>
 -#include <libempathy-gtk/empathy-ui-utils.h>
 +#include "empathy-geometry.h"
 +#include "empathy-ui-utils.h"
 +#include "empathy-utils.h"
  
 -#include "empathy-debug-window.h"
 +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 +#include "empathy-debug.h"
  
  G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window,
      GTK_TYPE_WINDOW)
@@@ -1006,7 -1006,7 +1006,7 @@@ debug_window_name_owner_changed_cb (TpD
        return;
      }
  
 -  if (EMP_STR_EMPTY (arg1) && !EMP_STR_EMPTY (arg2))
 +  if (TPAW_STR_EMPTY (arg1) && !TPAW_STR_EMPTY (arg2))
      {
        GtkTreeIter *found_at_iter = NULL;
        gchar *display_name;
@@@ -1086,7 -1086,7 +1086,7 @@@
  
        g_free (display_name);
      }
 -  else if (!EMP_STR_EMPTY (arg1) && EMP_STR_EMPTY (arg2))
 +  else if (!TPAW_STR_EMPTY (arg1) && TPAW_STR_EMPTY (arg2))
      {
        /* A service died */
        GtkTreeIter *iter = NULL;
@@@ -1298,7 -1298,7 +1298,7 @@@ debug_window_menu_copy_activate_cb (Gtk
  
    message = tp_debug_message_get_message (msg);
  
 -  if (EMP_STR_EMPTY (message))
 +  if (TPAW_STR_EMPTY (message))
      {
        DEBUG ("Log message is empty");
        return;
@@@ -2063,7 -2063,12 +2063,12 @@@ am_prepared_cb (GObject *am
        (GtkTreeCellDataFunc) debug_window_level_formatter, NULL, NULL);
  
    renderer = gtk_cell_renderer_text_new ();
-   g_object_set (renderer, "family", "Monospace", NULL);
+ 
+   g_object_set (renderer,
+       "family", "Monospace",
+       "ellipsize", PANGO_ELLIPSIZE_END,
+       NULL);
+ 
    gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view),
        -1, _("Message"), renderer,
        (GtkTreeCellDataFunc) debug_window_message_formatter, NULL, NULL);