Add en_GB in gitignore

[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 355b70902cdbe5fd27781da2b8f45b656dd368e1..24633e5653e17ca25c97c7e7b3697c676d9b686a 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -41,7 +41,7 @@
 #include "empathy-log-window.h"
 #include "empathy-account-chooser.h"
 #include "empathy-chat-view.h"
-#include "empathy-chat-simple-view.h"
+#include "empathy-theme-manager.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
@@ -160,7 +160,7 @@ empathy_log_window_show (McAccount   *account,
        }
 
        window = g_new0 (EmpathyLogWindow, 1);
-       window->log_manager = empathy_log_manager_new ();
+       window->log_manager = empathy_log_manager_dup_singleton ();
 
        filename = empathy_file_lookup ("empathy-log-window.glade",
                                        "libempathy-gtk");
@@ -208,13 +208,13 @@ empathy_log_window_show (McAccount   *account,
                          window);
 
        /* Configure Search EmpathyChatView */
-       window->chatview_find = EMPATHY_CHAT_VIEW (empathy_chat_simple_view_new ());
+       window->chatview_find = empathy_theme_manager_create_view (empathy_theme_manager_get ());
        gtk_container_add (GTK_CONTAINER (window->scrolledwindow_find),
                           GTK_WIDGET (window->chatview_find));
        gtk_widget_show (GTK_WIDGET (window->chatview_find));
 
        /* Configure Contacts EmpathyChatView */
-       window->chatview_chats = EMPATHY_CHAT_VIEW (empathy_chat_simple_view_new ());
+       window->chatview_chats = empathy_theme_manager_create_view (empathy_theme_manager_get ());
        gtk_container_add (GTK_CONTAINER (window->scrolledwindow_chats),
                           GTK_WIDGET (window->chatview_chats));
        gtk_widget_show (GTK_WIDGET (window->chatview_chats));
@@ -290,7 +290,7 @@ log_window_entry_find_changed_cb (GtkWidget       *entry,
 
        str = gtk_entry_get_text (GTK_ENTRY (window->entry_find));
 
-       is_sensitive &= !G_STR_EMPTY (str);
+       is_sensitive &= !EMP_STR_EMPTY (str);
        is_sensitive &= 
                !window->last_find || 
                (window->last_find && strcmp (window->last_find, str) != 0);
@@ -400,7 +400,7 @@ log_window_find_populate (EmpathyLogWindow *window,
 
        gtk_list_store_clear (store);
 
-       if (G_STR_EMPTY (search_criteria)) {
+       if (EMP_STR_EMPTY (search_criteria)) {
                /* Just clear the search. */
                return;
        }