Merge remote-tracking branch 'jonny/ft'

[empathy.git] / libempathy-gtk / empathy-log-window.c

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index cc3a9061493d8de6663ecfd7208e75d0cd3c7f67..af375f1b51f27b86236e8298772dbb85edecc621 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -298,16 +298,6 @@ ctx_free (Ctx *ctx)
   g_slice_free (Ctx, ctx);
 }
 
-static void
-account_chooser_ready_cb (EmpathyAccountChooser *chooser,
-    EmpathyLogWindow *self)
-{
-  /* We'll display the account once the model has been populate with the chats
-   * of this account. */
-  empathy_account_chooser_set_account (EMPATHY_ACCOUNT_CHOOSER (
-      self->priv->account_chooser), self->priv->selected_account);
-}
-
 static void
 select_account_once_ready (EmpathyLogWindow *self,
     TpAccount *account,
@@ -326,12 +316,8 @@ select_account_once_ready (EmpathyLogWindow *self,
 
   self->priv->selected_is_chatroom = is_chatroom;
 
-  if (empathy_account_chooser_is_ready (account_chooser))
-    account_chooser_ready_cb (account_chooser, self);
-  else
-    /* Chat will be selected once the account chooser is ready */
-    g_signal_connect (account_chooser, "ready",
-        G_CALLBACK (account_chooser_ready_cb), self);
+  empathy_account_chooser_set_account (account_chooser,
+      self->priv->selected_account);
 }
 
 static void
@@ -617,6 +603,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
   GFile *gfile;
   GtkWidget *vbox, *accounts, *search, *label, *closeitem;
   GtkWidget *scrolledwindow_events;
+  gchar *uri;
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_LOG_WINDOW, EmpathyLogWindowPriv);
@@ -670,7 +657,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
       G_CALLBACK (gtk_widget_destroy), self);
 
   /* Account chooser for chats */
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
 
   self->priv->account_chooser = empathy_account_chooser_new ();
   account_chooser = EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser);
@@ -700,7 +687,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
   gtk_container_add (GTK_CONTAINER (accounts), vbox);
 
   /* Search entry */
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
 
   self->priv->search_entry = gtk_entry_new ();
   gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry),
@@ -759,9 +746,10 @@ empathy_log_window_init (EmpathyLogWindow *self)
   gfile = g_file_new_for_path (filename);
   g_free (filename);
 
-  webkit_web_view_load_uri (WEBKIT_WEB_VIEW (self->priv->webview),
-      g_file_get_uri (gfile));
+  uri = g_file_get_uri (gfile);
+  webkit_web_view_load_uri (WEBKIT_WEB_VIEW (self->priv->webview), uri);
   g_object_unref (gfile);
+  g_free (uri);
 
   /* handle all navigation externally */
   g_signal_connect (self->priv->webview, "navigation-policy-decision-requested",
@@ -1634,9 +1622,11 @@ model_has_date (GtkTreeModel *model,
   if (!g_date_compare (date, d))
     {
       has_element = TRUE;
+      g_date_free (d);
       return TRUE;
     }
 
+  g_date_free (d);
   return FALSE;
 }
 
@@ -1817,18 +1807,27 @@ populate_dates_from_search_hits (GList *accounts,
 
   if (gtk_tree_model_get_iter_first (model, &iter))
     {
+      GDate *date;
+
+      date = g_date_new_dmy (1, 1, -1),
+
       gtk_list_store_prepend (store, &iter);
       gtk_list_store_set (store, &iter,
-          COL_WHEN_DATE, g_date_new_dmy (1, 1, -1),
+          COL_WHEN_DATE, date,
           COL_WHEN_TEXT, "separator",
           -1);
 
+      g_date_free (date);
+
+      date = g_date_new_dmy (2, 1, -1),
       gtk_list_store_prepend (store, &iter);
       gtk_list_store_set (store, &iter,
-          COL_WHEN_DATE, g_date_new_dmy (2, 1, -1),
+          COL_WHEN_DATE, date,
           COL_WHEN_TEXT, _("Anytime"),
           -1);
 
+      g_date_free (date);
+
       if (gtk_tree_model_iter_nth_child (model, &iter, NULL, 2))
         gtk_tree_selection_select_iter (selection, &iter);
     }
@@ -2796,6 +2795,7 @@ sort_by_date (GtkTreeModel *model,
     gpointer user_data)
 {
   GDate *date1, *date2;
+  gint result;
 
   gtk_tree_model_get (model, a,
       COL_WHEN_DATE, &date1,
@@ -2805,7 +2805,11 @@ sort_by_date (GtkTreeModel *model,
       COL_WHEN_DATE, &date2,
       -1);
 
-  return g_date_compare (date1, date2);
+  result =  g_date_compare (date1, date2);
+
+  g_date_free (date1);
+  g_date_free (date2);
+  return result;
 }
 
 static gboolean
@@ -3348,6 +3352,8 @@ log_window_get_messages_for_dates (EmpathyLogWindow *self,
                           event_mask, subtype, self->priv->count);
                       _tpl_action_chain_append (self->priv->chain, get_events_for_date, ctx);
                     }
+
+                  g_date_free (d);
                 }
             }
         }
@@ -3432,18 +3438,30 @@ log_manager_got_dates_cb (GObject *manager,
 
       if (g_strcmp0 (separator, "separator") != 0)
         {
+          GDate *date;
+
+          date = g_date_new_dmy (1, 1, -1);
+
           gtk_list_store_prepend (store, &iter);
           gtk_list_store_set (store, &iter,
-              COL_WHEN_DATE, g_date_new_dmy (1, 1, -1),
+              COL_WHEN_DATE, date,
               COL_WHEN_TEXT, "separator",
               -1);
 
+          g_date_free (date);
+
+          date = g_date_new_dmy (2, 1, -1);
+
           gtk_list_store_prepend (store, &iter);
           gtk_list_store_set (store, &iter,
-              COL_WHEN_DATE, g_date_new_dmy (2, 1, -1),
+              COL_WHEN_DATE, date,
               COL_WHEN_TEXT, _("Anytime"),
               -1);
+
+          g_date_free (date);
         }
+
+      g_free (separator);
     }
 
   g_list_free_full (dates, g_free);
@@ -3700,22 +3718,10 @@ log_window_logger_clear_account_cb (TpProxy *proxy,
   gtk_tree_store_clear (self->priv->store_events);
   log_window_who_populate (self);
 
-  /* Re-filter the account chooser so the accounts without logs get greyed out */
-  empathy_account_chooser_set_filter (
-      EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser),
-      empathy_account_chooser_filter_has_logs, NULL);
-}
-
-static void
-log_window_clear_logs_chooser_select_account (EmpathyAccountChooser *chooser,
-    EmpathyLogWindow *self)
-{
-  EmpathyAccountChooser *account_chooser;
-
-  account_chooser = EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser);
-
-  empathy_account_chooser_set_account (chooser,
-      empathy_account_chooser_get_account (account_chooser));
+  /* Re-filter the account chooser so the accounts without logs get
+   * greyed out */
+  empathy_account_chooser_refilter (
+      EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser));
 }
 
 static void
@@ -3731,15 +3737,13 @@ log_window_delete_menu_clicked_cb (GtkMenuItem *menuitem,
 
   account_chooser = (EmpathyAccountChooser *) empathy_account_chooser_new ();
   empathy_account_chooser_set_has_all_option (account_chooser, TRUE);
-  empathy_account_chooser_set_filter (account_chooser,
-      empathy_account_chooser_filter_has_logs, NULL);
+
+  empathy_account_chooser_refilter (account_chooser);
 
   /* Select the same account as in the history window */
-  if (empathy_account_chooser_is_ready (account_chooser))
-    log_window_clear_logs_chooser_select_account (account_chooser, self);
-  else
-    g_signal_connect (account_chooser, "ready",
-        G_CALLBACK (log_window_clear_logs_chooser_select_account), self);
+  empathy_account_chooser_set_account (account_chooser,
+      empathy_account_chooser_get_account (
+        EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser)));
 
   dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (self),
       GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING,
@@ -3754,7 +3758,7 @@ log_window_delete_menu_clicked_cb (GtkMenuItem *menuitem,
   content_area = gtk_message_dialog_get_message_area (
       GTK_MESSAGE_DIALOG (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   label = gtk_label_new (_("Delete from:"));
   gtk_box_pack_start (GTK_BOX (hbox), label,
       FALSE, FALSE, 0);