Merge branch 'trivia'

diff --combined src/empathy-main-window.c
index 07725fa3b8e22ebbffa566efb6579c2f48b1b470,5f9767639c47d08b75afb7ba3608001e3b31d659..fa6f1531007e385ae1b8fe5981481b71ca617088
--- 1/src/empathy-main-window.c
--- 2/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@@ -91,8 -91,10 +91,10 @@@
  /* Name in the geometry file */
  #define GEOMETRY_NAME "main-window"
  
- /* Labels for empty contact list */
- #define NO_MATCH_FOUND _("No match found")
+ enum {
+       PAGE_NO_MATCH = 0,
+       PAGE_CONTACT_LIST
+ };
  
  G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW);
  
@@@ -375,11 -377,16 +377,16 @@@ main_window_row_deleted_cb (GtkTreeMode
  
                if (empathy_individual_view_is_searching (
                                priv->individual_view)) {
-                       gtk_label_set_text (GTK_LABEL (priv->no_entry_label),
-                                       NO_MATCH_FOUND);
+                       gchar *tmp;
+ 
+                       tmp = g_strdup_printf ("<b><span size='xx-large'>%s</span></b>",
+                               _("No match found"));
+ 
+                       gtk_label_set_markup (GTK_LABEL (priv->no_entry_label), tmp);
+                       g_free (tmp);
+ 
                        gtk_notebook_set_current_page (
-                                       GTK_NOTEBOOK (priv->notebook),
-                                       0);
+                                       GTK_NOTEBOOK (priv->notebook), PAGE_NO_MATCH);
                }
        }
  }
@@@ -395,7 -402,7 +402,7 @@@ main_window_row_inserted_cb (GtkTreeMod
        if (priv->empty) {
                priv->empty = FALSE;
                gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
-                               1);
+                               PAGE_CONTACT_LIST);
                gtk_widget_grab_focus (GTK_WIDGET (priv->individual_view));
        }
  }
@@@ -1673,12 -1680,9 +1680,12 @@@ empathy_main_window_init (EmpathyMainWi
                        individual_manager);
        g_object_unref (individual_manager);
  
 +      /* For the moment, we disallow Persona drops onto the main contact list (e.g. from things such as
 +       * the EmpathyPersonaView in the linking dialogue). No code is hooked up to do anything on a Persona
 +       * drop, so allowing them would achieve nothing except confusion. */
        priv->individual_view = empathy_individual_view_new (
                        priv->individual_store,
 -                      EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL,
 +                      EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP,
                        EMPATHY_INDIVIDUAL_FEATURE_ALL);
  
        priv->butterfly_log_migration_members_changed_id = g_signal_connect (