#include <string.h>
#include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "empathy-log-window.h"
#include "empathy-account-chooser.h"
#include "empathy-chat-view.h"
+#include "empathy-theme-manager.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
}
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");
window);
/* Configure Search EmpathyChatView */
- window->chatview_find = empathy_chat_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_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));
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);
gtk_list_store_clear (store);
- if (G_STR_EMPTY (search_criteria)) {
+ if (EMP_STR_EMPTY (search_criteria)) {
/* Just clear the search. */
return;
}
selection = gtk_tree_view_get_selection (view);
store = GTK_LIST_STORE (model);
+ if (account == NULL) {
+ gtk_list_store_clear (store);
+ return;
+ }
+
/* Block signals to stop the logs being retrieved prematurely */
g_signal_handlers_block_by_func (selection,
log_window_chats_changed_cb,