#include "empathy-images.h"
#include "empathy-theme-manager.h"
#include "empathy-ui-utils.h"
-// FIXME: this work forces a dependency on webkit
#include "empathy-webkit-utils.h"
+#include "empathy-geometry.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include <libempathy/empathy-debug.h>
+#define EMPATHY_NS "http://live.gnome.org/Empathy"
+
G_DEFINE_TYPE (EmpathyLogWindow, empathy_log_window, GTK_TYPE_WINDOW);
struct _EmpathyLogWindowPriv
TpBaseClient *observer;
EmpathyContact *selected_contact;
+ EmpathyContact *events_contact;
EmpathyCameraMonitor *camera_monitor;
GBinding *button_video_binding;
gboolean selected_is_chatroom;
GSettings *gsettings_chat;
+ GSettings *gsettings_desktop;
};
static void log_window_search_entry_changed_cb (GtkWidget *entry,
static void start_spinner (void);
static void log_window_create_observer (EmpathyLogWindow *window);
+static gboolean log_window_events_button_press_event (GtkWidget *webview,
+ GdkEventButton *event, EmpathyLogWindow *self);
+static void log_window_update_buttons_sensitivity (EmpathyLogWindow *self);
static void
empathy_account_chooser_filter_has_logs (TpAccount *account,
COL_WHO_TYPE,
COL_WHO_ICON,
COL_WHO_NAME,
+ COL_WHO_NAME_SORT_KEY,
COL_WHO_ID,
COL_WHO_ACCOUNT,
COL_WHO_TARGET,
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,
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
GtkTreeIter *iter)
{
char *str = gtk_tree_path_to_string (path);
- char *script, *text;
+ char *script, *text, *date, *stock_icon;
+ char *icon = NULL;
gtk_tree_model_get (model, iter,
COL_EVENTS_TEXT, &text,
+ COL_EVENTS_PRETTY_DATE, &date,
+ COL_EVENTS_ICON, &stock_icon,
-1);
- script = g_strdup_printf ("javascript:%s([%s], '%s');",
+ if (!tp_str_empty (stock_icon))
+ {
+ GtkIconInfo *icon_info = gtk_icon_theme_lookup_icon (
+ gtk_icon_theme_get_default (),
+ stock_icon,
+ GTK_ICON_SIZE_MENU, 0);
+
+ if (icon_info != NULL)
+ icon = g_strdup (gtk_icon_info_get_filename (icon_info));
+
+ gtk_icon_info_free (icon_info);
+ }
+
+ script = g_strdup_printf ("javascript:%s([%s], '%s', '%s', '%s');",
method,
g_strdelimit (str, ":", ','),
- text);
+ text,
+ icon != NULL ? icon : "",
+ date);
- // g_print ("%s\n", script);
webkit_web_view_execute_script (WEBKIT_WEB_VIEW (self->priv->webview),
script);
g_free (str);
g_free (text);
+ g_free (date);
+ g_free (stock_icon);
+ g_free (icon);
g_free (script);
}
script = g_strdup_printf ("javascript:deleteRow([%s]);",
g_strdelimit (str, ":", ','));
- // g_print ("%s\n", script);
webkit_web_view_execute_script (WEBKIT_WEB_VIEW (self->priv->webview),
script);
g_strdelimit (str, ":", ','),
gtk_tree_model_iter_has_child (model, iter));
- // g_print ("%s\n", script);
webkit_web_view_execute_script (WEBKIT_WEB_VIEW (self->priv->webview),
script);
tp_clear_object (&self->priv->log_manager);
tp_clear_object (&self->priv->selected_account);
tp_clear_object (&self->priv->selected_contact);
+ tp_clear_object (&self->priv->events_contact);
tp_clear_object (&self->priv->camera_monitor);
+
tp_clear_object (&self->priv->gsettings_chat);
+ tp_clear_object (&self->priv->gsettings_desktop);
tp_clear_object (&self->priv->store_events);
GtkBuilder *gui;
gchar *filename;
GFile *gfile;
- GtkWidget *vbox, *accounts, *search, *label, *quit;
+ GtkWidget *vbox, *accounts, *search, *label, *closeitem;
GtkWidget *scrolledwindow_events;
+ gchar *uri;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_LOG_WINDOW, EmpathyLogWindowPriv);
self->priv->log_manager = tpl_log_manager_dup_singleton ();
self->priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
+ self->priv->gsettings_desktop = g_settings_new (
+ EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA);
gtk_window_set_title (GTK_WINDOW (self), _("History"));
gtk_widget_set_can_focus (GTK_WIDGET (self), FALSE);
"toolbutton_video", &self->priv->button_video,
"toolbutton_accounts", &accounts,
"toolbutton_search", &search,
- "imagemenuitem_quit", &quit,
+ "imagemenuitem_close", &closeitem,
"treeview_who", &self->priv->treeview_who,
"treeview_what", &self->priv->treeview_what,
"treeview_when", &self->priv->treeview_when,
g_object_unref (gui);
- g_signal_connect_swapped (quit, "activate",
+ g_signal_connect_swapped (closeitem, "activate",
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);
empathy_account_chooser_filter_has_logs, NULL);
empathy_account_chooser_set_all (account_chooser);
+ gtk_style_context_add_class (gtk_widget_get_style_context (self->priv->account_chooser),
+ GTK_STYLE_CLASS_RAISED);
+
g_signal_connect (self->priv->account_chooser, "changed",
G_CALLBACK (log_window_chats_accounts_changed_cb),
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_stock (GTK_ENTRY (self->priv->search_entry),
- GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
- gtk_entry_set_icon_from_stock (GTK_ENTRY (self->priv->search_entry),
- GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry),
+ GTK_ENTRY_ICON_SECONDARY, "edit-find-symbolic");
+ gtk_entry_set_icon_sensitive (GTK_ENTRY (self->priv->search_entry),
+ GTK_ENTRY_ICON_SECONDARY, FALSE);
label = gtk_label_new (_("Search"));
self->priv->webview);
gtk_widget_show (self->priv->webview);
+ empathy_webkit_bind_font_setting (WEBKIT_WEB_VIEW (self->priv->webview),
+ self->priv->gsettings_desktop,
+ EMPATHY_PREFS_DESKTOP_INTERFACE_FONT_NAME);
+
filename = empathy_file_lookup ("empathy-log-window.html", "data");
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",
g_signal_connect (self->priv->store_events, "row-has-child-toggled",
G_CALLBACK (store_events_has_child_rows), self);
+ /* track clicked row */
+ g_signal_connect (self->priv->webview, "button-press-event",
+ G_CALLBACK (log_window_events_button_press_event), self);
+
+ log_window_update_buttons_sensitivity (self);
gtk_widget_show (GTK_WIDGET (self));
+
+ empathy_geometry_bind (GTK_WINDOW (self), "log-window");
}
GtkWidget *
static void
log_window_create_observer (EmpathyLogWindow *self)
{
- TpDBusDaemon *dbus;
- GError *error = NULL;
-
- dbus = tp_dbus_daemon_dup (&error);
+ TpAccountManager *am;
- if (dbus == NULL)
- {
- DEBUG ("Could not connect to the bus: %s", error->message);
- g_error_free (error);
- return;
- }
+ am = tp_account_manager_dup ();
- self->priv->observer = tp_simple_observer_new (dbus, TRUE, "LogWindow",
+ self->priv->observer = tp_simple_observer_new_with_am (am, TRUE, "LogWindow",
TRUE, observe_channels,
g_object_ref (self), g_object_unref);
+
self->priv->channels = g_hash_table_new_full (g_direct_hash, g_direct_equal,
g_object_unref, g_object_unref);
tp_base_client_register (self->priv->observer, NULL);
- g_object_unref (dbus);
+ g_object_unref (am);
}
static TplEntity *
GDateTime *date;
gchar *body, *pretty_date;
- date = g_date_time_new_from_unix_utc (
+ date = g_date_time_new_from_unix_local (
tpl_event_get_timestamp (event));
pretty_date = g_date_time_format (date,
COL_EVENTS_TS, tpl_event_get_timestamp (event),
COL_EVENTS_PRETTY_DATE, pretty_date,
COL_EVENTS_TEXT, body,
- COL_EVENTS_ICON, "stock_text_justify",
+ COL_EVENTS_ICON, "format-justify-fill",
COL_EVENTS_ACCOUNT, tpl_event_get_account (event),
COL_EVENTS_TARGET, event_get_target (event),
COL_EVENTS_EVENT, event,
EmpathyStringParser *parsers;
GString *msg;
- date = g_date_time_new_from_unix_utc (
+ date = g_date_time_new_from_unix_local (
tpl_event_get_timestamp (event));
pretty_date = g_date_time_format (date, "%X");
}
}
- started_date = g_date_time_new_from_unix_utc (
+ started_date = g_date_time_new_from_unix_local (
tpl_event_get_timestamp (event));
pretty_date = g_date_time_format (started_date,
if (tpl_call_event_get_end_reason (call) != TPL_CALL_END_REASON_NO_ANSWER)
{
gchar *body;
+ gchar *tmp;
span = tpl_call_event_get_duration (TPL_CALL_EVENT (event));
+
if (span < 60)
- duration = g_strdup_printf (_("%" G_GINT64_FORMAT " seconds"), span);
+ {
+ tmp = g_strdup_printf ("%" G_GINT64_FORMAT, span);
+ duration = g_strdup_printf (
+ ngettext ("%s second", "%s seconds", span), tmp);
+ g_free (tmp);
+ }
else
- duration = g_strdup_printf (_("%" G_GINT64_FORMAT " minutes"),
- span / 60);
+ {
+ tmp = g_strdup_printf ("%" G_GINT64_FORMAT, span / 60);
+ duration = g_strdup_printf (
+ ngettext ("%s minute", "%s minutes", span / 60), tmp);
+ g_free (tmp);
+ }
finished_date = g_date_time_add (started_date, -span);
finished = g_date_time_format (finished_date, "%X");
if (!g_date_compare (date, d))
{
has_element = TRUE;
+ g_date_free (d);
return TRUE;
}
+ g_date_free (d);
return FALSE;
}
text = g_date_time_format (dt, "%A");
else
text = g_date_time_format (dt,
- C_("A date such as '23 May 2010', "
- "%e is the day, %B the month and %Y the year",
- "%e %B %Y"));
+ /* Translators: A date such as '23 May 2010' (strftime format) */
+ _("%e %B %Y"));
g_date_time_unref (dt);
}
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);
}
{
TplEntityType type = tpl_entity_get_entity_type (hit->target);
EmpathyContact *contact;
+ const gchar *name;
+ gchar *sort_key;
gboolean room = type == TPL_ENTITY_ROOM;
contact = empathy_contact_from_tpl_contact (hit->account,
hit->target);
+ name = empathy_contact_get_alias (contact);
+ sort_key = g_utf8_collate_key (name, -1);
+
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
COL_WHO_TYPE, COL_TYPE_NORMAL,
COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE
: EMPATHY_IMAGE_AVATAR_DEFAULT,
- COL_WHO_NAME, empathy_contact_get_alias (contact),
+ COL_WHO_NAME, name,
+ COL_WHO_NAME_SORT_KEY, sort_key,
COL_WHO_ID, tpl_entity_get_identifier (hit->target),
COL_WHO_ACCOUNT, hit->account,
COL_WHO_TARGET, hit->target,
-1);
+ g_free (sort_key);
g_object_unref (contact);
}
}
log_window_search_entry_changed_cb (GtkWidget *entry,
EmpathyLogWindow *self)
{
+ const gchar *str;
+
+ str = gtk_entry_get_text (GTK_ENTRY (self->priv->search_entry));
+
+ if (!tp_str_empty (str))
+ {
+ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry),
+ GTK_ENTRY_ICON_SECONDARY, "edit-clear-symbolic");
+ gtk_entry_set_icon_sensitive (GTK_ENTRY (self->priv->search_entry),
+ GTK_ENTRY_ICON_SECONDARY, TRUE);
+ }
+ else
+ {
+ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry),
+ GTK_ENTRY_ICON_SECONDARY, "edit-find-symbolic");
+ gtk_entry_set_icon_sensitive (GTK_ENTRY (self->priv->search_entry),
+ GTK_ENTRY_ICON_SECONDARY, FALSE);
+ }
+
if (self->priv->source != 0)
g_source_remove (self->priv->source);
self->priv->source = g_timeout_add (500, (GSourceFunc) start_find_search,
"", -1);
}
+static void
+do_update_buttons_sensitivity (EmpathyLogWindow *self)
+{
+ EmpathyCapabilities capabilities;
+ gboolean profile, chat, call, video;
+
+ tp_clear_object (&self->priv->button_video_binding);
+
+ if (self->priv->selected_contact != NULL)
+ {
+ capabilities = empathy_contact_get_capabilities (
+ self->priv->selected_contact);
+
+ profile = chat = TRUE;
+ call = capabilities & EMPATHY_CAPABILITIES_AUDIO;
+ video = capabilities & EMPATHY_CAPABILITIES_VIDEO;
+ }
+ else
+ {
+ profile = chat = call = video = FALSE;
+ }
+
+ gtk_widget_set_sensitive (self->priv->button_profile, profile);
+ gtk_widget_set_sensitive (self->priv->button_chat, chat);
+ gtk_widget_set_sensitive (self->priv->button_call, call);
+
+ if (video)
+ {
+ self->priv->button_video_binding = g_object_bind_property (
+ self->priv->camera_monitor, "available",
+ self->priv->button_video, "sensitive",
+ G_BINDING_SYNC_CREATE);
+ }
+ else
+ {
+ /* Don't override the binding */
+ gtk_widget_set_sensitive (self->priv->button_video, video);
+ }
+}
+
+static void
+contact_capabilities_changed_cb (EmpathyContact *contact,
+ GParamSpec *spec,
+ EmpathyLogWindow *self)
+{
+ do_update_buttons_sensitivity (self);
+}
+
static void
log_window_update_buttons_sensitivity (EmpathyLogWindow *self)
{
GtkTreeView *view;
GtkTreeModel *model;
GtkTreeSelection *selection;
- EmpathyCapabilities capabilities;
TpAccount *account;
TplEntity *target;
GtkTreeIter iter;
GList *paths;
GtkTreePath *path;
- gboolean profile, chat, call, video;
- tp_clear_object (&self->priv->selected_contact);
- tp_clear_object (&self->priv->button_video_binding);
+ if (self->priv->selected_contact != NULL)
+ {
+ g_signal_handlers_disconnect_by_func (self->priv->selected_contact,
+ contact_capabilities_changed_cb, self);
+
+ tp_clear_object (&self->priv->selected_contact);
+ }
view = GTK_TREE_VIEW (self->priv->treeview_who);
model = gtk_tree_view_get_model (view);
selection = gtk_tree_view_get_selection (view);
- profile = chat = call = video = FALSE;
-
if (!gtk_tree_model_get_iter_first (model, &iter))
goto events;
g_object_unref (account);
g_object_unref (target);
- capabilities = empathy_contact_get_capabilities (self->priv->selected_contact);
-
- profile = chat = TRUE;
- call = capabilities & EMPATHY_CAPABILITIES_AUDIO;
- video = capabilities & EMPATHY_CAPABILITIES_VIDEO;
-
goto out;
events:
/* If the Who pane doesn't contain a contact (e.g. it has many
* selected, or has 'Anyone', let's try to get the contact from
* the selected event. */
- goto out; // FIXME: reimplement
- // view = GTK_TREE_VIEW (self->priv->treeview_events);
- // model = gtk_tree_view_get_model (view);
- // selection = gtk_tree_view_get_selection (view);
-
- // if (gtk_tree_selection_count_selected_rows (selection) != 1)
- // goto out;
- // if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
- // goto out;
-
- gtk_tree_model_get (model, &iter,
- COL_EVENTS_ACCOUNT, &account,
- COL_EVENTS_TARGET, &target,
- -1);
-
- self->priv->selected_contact = empathy_contact_from_tpl_contact (account,
- target);
-
- g_object_unref (account);
- g_object_unref (target);
-
- capabilities = empathy_contact_get_capabilities (self->priv->selected_contact);
-
- profile = chat = TRUE;
- call = capabilities & EMPATHY_CAPABILITIES_AUDIO;
- video = capabilities & EMPATHY_CAPABILITIES_VIDEO;
-
- if (video)
- self->priv->button_video_binding = g_object_bind_property (
- self->priv->camera_monitor, "available",
- self->priv->button_video, "sensitive",
- G_BINDING_SYNC_CREATE);
+ if (self->priv->events_contact != NULL)
+ self->priv->selected_contact = g_object_ref (self->priv->events_contact);
out:
- gtk_widget_set_sensitive (self->priv->button_profile, profile);
- gtk_widget_set_sensitive (self->priv->button_chat, chat);
- gtk_widget_set_sensitive (self->priv->button_call, call);
+ if (self->priv->selected_contact != NULL)
+ {
+ tp_g_signal_connect_object (self->priv->selected_contact,
+ "notify::capabilities", G_CALLBACK (contact_capabilities_changed_cb),
+ self, 0);
+ }
- /* Don't override the binding */
- if (!video)
- gtk_widget_set_sensitive (self->priv->button_video, video);
+ do_update_buttons_sensitivity (self);
}
static void
TplEntity *entity = TPL_ENTITY (l->data);
TplEntityType type = tpl_entity_get_entity_type (entity);
EmpathyContact *contact;
+ const gchar *name;
+ gchar *sort_key;
gboolean room = type == TPL_ENTITY_ROOM;
contact = empathy_contact_from_tpl_contact (ctx->account, entity);
+ name = empathy_contact_get_alias (contact);
+ sort_key = g_utf8_collate_key (name, -1);
+
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
COL_WHO_TYPE, COL_TYPE_NORMAL,
COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE
: EMPATHY_IMAGE_AVATAR_DEFAULT,
- COL_WHO_NAME, empathy_contact_get_alias (contact),
+ COL_WHO_NAME, name,
+ COL_WHO_NAME_SORT_KEY, sort_key,
COL_WHO_ID, tpl_entity_get_identifier (entity),
COL_WHO_ACCOUNT, ctx->account,
COL_WHO_TARGET, entity,
-1);
+ g_free (sort_key);
g_object_unref (contact);
if (ctx->self->priv->selected_account != NULL &&
}
static gint
-sort_by_name (GtkTreeModel *model,
+sort_by_name_key (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
gpointer user_data)
{
- gchar *name1, *name2;
+ gchar *key1, *key2;
gint type1, type2;
gint ret;
gtk_tree_model_get (model, a,
COL_WHO_TYPE, &type1,
- COL_WHO_NAME, &name1,
+ COL_WHO_NAME_SORT_KEY, &key1,
-1);
gtk_tree_model_get (model, b,
COL_WHO_TYPE, &type2,
- COL_WHO_NAME, &name2,
+ COL_WHO_NAME_SORT_KEY, &key2,
-1);
if (type1 == COL_TYPE_ANY)
else if (type2 == COL_TYPE_SEPARATOR)
ret = 1;
else
- ret = g_strcmp0 (name1, name2);
+ ret = g_strcmp0 (key1, key2);
- g_free (name1);
- g_free (name2);
+ g_free (key1);
+ g_free (key2);
return ret;
}
return (type == COL_TYPE_SEPARATOR);
}
-// static void
-// log_window_events_changed_cb (GtkTreeSelection *selection,
-// EmpathyLogWindow *self)
-// {
-// DEBUG ("log_window_events_changed_cb");
-//
-// log_window_update_buttons_sensitivity (self);
-// }
-
-// static void
-// log_window_events_row_activated_cb (GtkTreeView *view,
-// GtkTreePath *path,
-// GtkTreeViewColumn *column,
-// EmpathyLogWindow *self)
-// {
-// if (gtk_tree_view_row_expanded (view, path))
-// gtk_tree_view_collapse_row (view, path);
-// else
-// gtk_tree_view_expand_row (view, path, FALSE);
-// }
+static void
+log_window_find_row (EmpathyLogWindow *self,
+ GdkEventButton *event)
+{
+ WebKitHitTestResult *hit = webkit_web_view_get_hit_test_result (
+ WEBKIT_WEB_VIEW (self->priv->webview), event);
+ WebKitDOMNode *inner_node;
+
+ tp_clear_object (&self->priv->events_contact);
+
+ g_object_get (hit,
+ "inner-node", &inner_node,
+ NULL);
+
+ if (inner_node != NULL)
+ {
+ GtkTreeModel *model = GTK_TREE_MODEL (self->priv->store_events);
+ WebKitDOMNode *node;
+ const char *path = NULL;
+ GtkTreeIter iter;
+
+ /* walk back up the DOM tree looking for a node with empathy:path set */
+ for (node = inner_node; node != NULL;
+ node = webkit_dom_node_get_parent_node (node))
+ {
+ if (!WEBKIT_DOM_IS_ELEMENT (node))
+ continue;
+
+ path = webkit_dom_element_get_attribute_ns (
+ WEBKIT_DOM_ELEMENT (node), EMPATHY_NS, "path");
+
+ if (!tp_str_empty (path))
+ break;
+ }
+
+ /* look up the contact for this path */
+ if (!tp_str_empty (path) &&
+ gtk_tree_model_get_iter_from_string (model, &iter, path))
+ {
+ TpAccount *account;
+ TplEntity *target;
+
+ gtk_tree_model_get (model, &iter,
+ COL_EVENTS_ACCOUNT, &account,
+ COL_EVENTS_TARGET, &target,
+ -1);
+
+ self->priv->events_contact = empathy_contact_from_tpl_contact (
+ account, target);
+
+ g_object_unref (account);
+ g_object_unref (target);
+ }
+
+ g_object_unref (inner_node);
+ }
+
+ g_object_unref (hit);
+
+ log_window_update_buttons_sensitivity (self);
+}
+
+static gboolean
+log_window_events_button_press_event (GtkWidget *webview,
+ GdkEventButton *event,
+ EmpathyLogWindow *self)
+{
+ switch (event->button)
+ {
+ case 1:
+ log_window_find_row (self, event);
+ break;
+
+ case 3:
+ empathy_webkit_context_menu_for_event (
+ WEBKIT_WEB_VIEW (webview), event, 0);
+ return TRUE;
+
+ default:
+ break;
+ }
+
+ return FALSE;
+}
static void
log_window_events_setup (EmpathyLogWindow *self)
{
- GtkTreeModel *model;
GtkTreeSortable *sortable;
GtkTreeStore *store;
TPL_TYPE_ENTITY, /* target */
TPL_TYPE_EVENT); /* event */
- model = GTK_TREE_MODEL (store);
sortable = GTK_TREE_SORTABLE (store);
gtk_tree_sortable_set_sort_column_id (sortable,
G_TYPE_INT, /* type */
G_TYPE_STRING, /* icon */
G_TYPE_STRING, /* name */
+ G_TYPE_STRING, /* name sort key */
G_TYPE_STRING, /* id */
TP_TYPE_ACCOUNT, /* account */
TPL_TYPE_ENTITY); /* target */
NULL, NULL);
gtk_tree_sortable_set_sort_column_id (sortable,
- COL_WHO_NAME,
+ COL_WHO_NAME_SORT_KEY,
GTK_SORT_ASCENDING);
gtk_tree_sortable_set_sort_func (sortable,
- COL_WHO_NAME, sort_by_name,
+ COL_WHO_NAME_SORT_KEY, sort_by_name_key,
NULL, NULL);
gtk_tree_view_set_search_column (view, COL_WHO_NAME);
gpointer user_data)
{
GDate *date1, *date2;
+ gint result;
gtk_tree_model_get (model, a,
COL_WHEN_DATE, &date1,
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
COL_WHEN_TEXT, &when,
-1);
- ret = g_str_equal (when, "separator");
+ ret = !tp_strdiff (when, "separator");
g_free (when);
return ret;
}
struct event events [] = {
{ TPL_EVENT_MASK_ANY, 0, NULL, _("Anything") },
{ WHAT_TYPE_SEPARATOR, 0, NULL, "separator" },
- { TPL_EVENT_MASK_TEXT, 0, "stock_text_justify", _("Text chats") },
+ { TPL_EVENT_MASK_TEXT, 0, "format-justify-fill", _("Text chats") },
#ifdef HAVE_CALL_LOGS
{ TPL_EVENT_MASK_CALL, EVENT_CALL_ALL, EMPATHY_IMAGE_CALL, _("Calls") },
#endif
gpointer user_data)
{
Ctx *ctx = user_data;
- // GtkTreeView *view;
- // GtkTreeModel *model;
- // GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
GList *events;
GList *l;
GError *error = NULL;
- // gint n;
+ gint n;
if (log_window == NULL)
{
}
g_list_free (events);
- // view = GTK_TREE_VIEW (log_window->priv->treeview_events);
- // model = gtk_tree_view_get_model (view);
- // n = gtk_tree_model_iter_n_children (model, NULL) - 1;
+ model = GTK_TREE_MODEL (log_window->priv->store_events);
+ n = gtk_tree_model_iter_n_children (model, NULL) - 1;
+
+ if (n >= 0 && gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
+ {
+ GtkTreePath *path;
+ char *str, *script;
+
+ path = gtk_tree_model_get_path (model, &iter);
+ str = gtk_tree_path_to_string (path);
- // if (n >= 0 && gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
- // {
- // GtkTreePath *path;
+ script = g_strdup_printf ("javascript:scrollToRow([%s]);",
+ g_strdelimit (str, ":", ','));
- // path = gtk_tree_model_get_path (model, &iter);
- // gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0, 0);
- // gtk_tree_path_free (path);
- // }
+ webkit_web_view_execute_script (
+ WEBKIT_WEB_VIEW (log_window->priv->webview),
+ script);
+
+ gtk_tree_path_free (path);
+ g_free (str);
+ g_free (script);
+ }
out:
ctx_free (ctx);
event_mask, subtype, self->priv->count);
_tpl_action_chain_append (self->priv->chain, get_events_for_date, ctx);
}
+
+ g_date_free (d);
}
}
}
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);
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
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,
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);
projects / empathy.git / blobdiff