X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-debug-window.c;h=ec59813553754d8d26b34947f91907e629fae274;hp=448c06f6921da5be506fe8cd0fbcc473b8ddfc54;hb=33ee7a9336197b3b43d87a90c667920b1c5c7e00;hpb=109e8dda543685f0ef6be6bc24e76ffce7e8e9f2 diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 448c06f6..ec598135 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -20,32 +20,19 @@ */ #include "config.h" - -#include +#include "empathy-debug-window.h" #include -#include -#include -#include #include +#include +#include -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include - -#include -#include -#include +#include "empathy-geometry.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include -#include -#include -#include -#include - -#include "extensions/extensions.h" - -#include "empathy-debug-window.h" +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window, GTK_TYPE_WINDOW) @@ -54,16 +41,12 @@ typedef enum { SERVICE_TYPE_CM = 0, SERVICE_TYPE_CLIENT, + SERVICE_TYPE_MC, } ServiceType; enum { - COL_DEBUG_TIMESTAMP = 0, - COL_DEBUG_DOMAIN, - COL_DEBUG_CATEGORY, - COL_DEBUG_LEVEL_STRING, - COL_DEBUG_MESSAGE, - COL_DEBUG_LEVEL_VALUE, + COL_DEBUG_MESSAGE = 0, NUM_DEBUG_COLS }; @@ -86,7 +69,7 @@ enum }; #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyDebugWindow) -typedef struct +struct _EmpathyDebugWindowPriv { /* Toolbar items */ GtkWidget *chooser; @@ -126,29 +109,29 @@ typedef struct gboolean dispose_run; TpAccountManager *am; GtkListStore *all_active_buffer; -} EmpathyDebugWindowPriv; +}; static const gchar * -log_level_to_string (guint level) +log_level_to_string (GLogLevelFlags level) { switch (level) { - case TP_DEBUG_LEVEL_ERROR: + case G_LOG_LEVEL_ERROR: return "Error"; break; - case TP_DEBUG_LEVEL_CRITICAL: + case G_LOG_LEVEL_CRITICAL: return "Critical"; break; - case TP_DEBUG_LEVEL_WARNING: + case G_LOG_LEVEL_WARNING: return "Warning"; break; - case TP_DEBUG_LEVEL_MESSAGE: + case G_LOG_LEVEL_MESSAGE: return "Message"; break; - case TP_DEBUG_LEVEL_INFO: + case G_LOG_LEVEL_INFO: return "Info"; break; - case TP_DEBUG_LEVEL_DEBUG: + case G_LOG_LEVEL_DEBUG: return "Debug"; break; default: @@ -160,14 +143,14 @@ log_level_to_string (guint level) static gchar * get_active_service_name (EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (self); GtkTreeIter iter; gchar *name; - if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->chooser), &iter)) + if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self->priv->chooser), + &iter)) return NULL; - gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter, + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->service_store), &iter, COL_NAME, &name, -1); return name; @@ -181,184 +164,133 @@ copy_buffered_messages (GtkTreeModel *buffer, { GtkListStore *active_buffer = data; GtkTreeIter active_buffer_iter; - gdouble timestamp; - gchar *domain, *category, *message, *level_string; - guint level; + TpDebugMessage *msg; gtk_tree_model_get (buffer, iter, - COL_DEBUG_TIMESTAMP, ×tamp, - COL_DEBUG_DOMAIN, &domain, - COL_DEBUG_CATEGORY, &category, - COL_DEBUG_LEVEL_STRING, &level_string, - COL_DEBUG_MESSAGE, &message, - COL_DEBUG_LEVEL_VALUE, &level, + COL_DEBUG_MESSAGE, &msg, -1); gtk_list_store_insert_with_values (active_buffer, &active_buffer_iter, -1, - COL_DEBUG_TIMESTAMP, timestamp, - COL_DEBUG_DOMAIN, domain, - COL_DEBUG_CATEGORY, category, - COL_DEBUG_LEVEL_STRING, level_string, - COL_DEBUG_MESSAGE, message, - COL_DEBUG_LEVEL_VALUE, level, + COL_DEBUG_MESSAGE, msg, -1); - g_free (domain); - g_free (category); - g_free (level_string); - g_free (message); + g_object_unref (msg); return FALSE; } static void insert_values_in_buffer (GtkListStore *store, - gdouble timestamp, - const gchar *domain, - const gchar *category, - guint level, - const gchar *string) + TpDebugMessage *msg) { GtkTreeIter iter; gtk_list_store_insert_with_values (store, &iter, -1, - COL_DEBUG_TIMESTAMP, timestamp, - COL_DEBUG_DOMAIN, domain, - COL_DEBUG_CATEGORY, category, - COL_DEBUG_LEVEL_STRING, log_level_to_string (level), - COL_DEBUG_MESSAGE, string, - COL_DEBUG_LEVEL_VALUE, level, + COL_DEBUG_MESSAGE, msg, -1); } static void -debug_window_add_message (EmpathyDebugWindow *debug_window, - TpProxy *proxy, - gdouble timestamp, - const gchar *domain_category, - guint level, - const gchar *message) -{ - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); - gchar *domain, *category; - gchar *string; +debug_window_add_message (EmpathyDebugWindow *self, + TpDebugClient *debug, + TpDebugMessage *msg) +{ GtkListStore *active_buffer, *pause_buffer; - if (g_strrstr (domain_category, "/")) - { - gchar **parts = g_strsplit (domain_category, "/", 2); - domain = g_strdup (parts[0]); - category = g_strdup (parts[1]); - g_strfreev (parts); - } - else - { - domain = g_strdup (domain_category); - category = g_strdup (""); - } - - if (g_str_has_suffix (message, "\n")) - string = g_strchomp (g_strdup (message)); - else - string = g_strdup (message); - - pause_buffer = g_object_get_data (G_OBJECT (proxy), "pause-buffer"); - active_buffer = g_object_get_data (G_OBJECT (proxy), "active-buffer"); + pause_buffer = g_object_get_data (G_OBJECT (debug), "pause-buffer"); + active_buffer = g_object_get_data (G_OBJECT (debug), "active-buffer"); - if (priv->paused) + if (self->priv->paused) { - insert_values_in_buffer (pause_buffer, timestamp, - domain, category, level, - string); + insert_values_in_buffer (pause_buffer, msg); } else { /* Append 'this' message to this service's and All's active-buffers */ - insert_values_in_buffer (active_buffer, timestamp, - domain, category, level, - string); + insert_values_in_buffer (active_buffer, msg); - insert_values_in_buffer (priv->all_active_buffer, timestamp, - domain, category, level, - string); + insert_values_in_buffer (self->priv->all_active_buffer, msg); } - - g_free (string); - g_free (domain); - g_free (category); } static void -debug_window_new_debug_message_cb (TpProxy *proxy, - gdouble timestamp, - const gchar *domain, - guint level, - const gchar *message, - gpointer user_data, - GObject *weak_object) +debug_window_new_debug_message_cb (TpDebugClient *debug, + TpDebugMessage *msg, + gpointer user_data) { - EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data; + EmpathyDebugWindow *self = user_data; - debug_window_add_message (debug_window, proxy, timestamp, domain, level, - message); + debug_window_add_message (self, debug, msg); } static void -debug_window_set_enabled (TpProxy *proxy, - gboolean enabled) +set_enabled_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) { - GValue *val; - - g_return_if_fail (proxy != NULL); + TpDebugClient *debug = TP_DEBUG_CLIENT (source); + gboolean enabled = GPOINTER_TO_UINT (user_data); + GError *error = NULL; - val = tp_g_value_slice_new_boolean (enabled); + if (!tp_debug_client_set_enabled_finish (debug, result, &error)) + { + DEBUG ("Failed to %s debugging on %s", enabled ? "enable" : "disable", + tp_proxy_get_bus_name (debug)); + g_error_free (error); + } +} - tp_cli_dbus_properties_call_set (proxy, -1, TP_IFACE_DEBUG, - "Enabled", val, NULL, NULL, NULL, NULL); +static void +debug_window_set_enabled (TpDebugClient *debug, + gboolean enabled) +{ + g_return_if_fail (debug != NULL); - tp_g_value_slice_free (val); + tp_debug_client_set_enabled_async (debug, enabled, + set_enabled_cb, GUINT_TO_POINTER (enabled)); } static void -debug_window_set_toolbar_sensitivity (EmpathyDebugWindow *debug_window, +debug_window_set_toolbar_sensitivity (EmpathyDebugWindow *self, gboolean sensitive) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); - GtkWidget *vbox = gtk_bin_get_child (GTK_BIN (debug_window)); + GtkWidget *vbox = gtk_bin_get_child (GTK_BIN (self)); - gtk_widget_set_sensitive (GTK_WIDGET (priv->save_button), sensitive); - gtk_widget_set_sensitive (GTK_WIDGET (priv->send_to_pastebin), sensitive); - gtk_widget_set_sensitive (GTK_WIDGET (priv->copy_button), sensitive); - gtk_widget_set_sensitive (GTK_WIDGET (priv->clear_button), sensitive); - gtk_widget_set_sensitive (GTK_WIDGET (priv->pause_button), sensitive); - gtk_widget_set_sensitive (GTK_WIDGET (priv->level_label), sensitive); - gtk_widget_set_sensitive (GTK_WIDGET (priv->level_filter), sensitive); - gtk_widget_set_sensitive (GTK_WIDGET (priv->view), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->save_button), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->send_to_pastebin), + sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->copy_button), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->clear_button), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->pause_button), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->level_label), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->level_filter), sensitive); + gtk_widget_set_sensitive (GTK_WIDGET (self->priv->view), sensitive); - if (sensitive && !priv->view_visible) + if (sensitive && !self->priv->view_visible) { /* Add view and remove label */ - gtk_container_remove (GTK_CONTAINER (vbox), priv->not_supported_label); - gtk_box_pack_start (GTK_BOX (vbox), priv->scrolled_win, TRUE, TRUE, 0); - priv->view_visible = TRUE; + gtk_container_remove (GTK_CONTAINER (vbox), + self->priv->not_supported_label); + gtk_box_pack_start (GTK_BOX (vbox), + self->priv->scrolled_win, TRUE, TRUE, 0); + self->priv->view_visible = TRUE; } - else if (!sensitive && priv->view_visible) + else if (!sensitive && self->priv->view_visible) { /* Add label and remove view */ - gtk_container_remove (GTK_CONTAINER (vbox), priv->scrolled_win); - gtk_box_pack_start (GTK_BOX (vbox), priv->not_supported_label, + gtk_container_remove (GTK_CONTAINER (vbox), self->priv->scrolled_win); + gtk_box_pack_start (GTK_BOX (vbox), self->priv->not_supported_label, TRUE, TRUE, 0); - priv->view_visible = FALSE; + self->priv->view_visible = FALSE; } } static gboolean debug_window_get_iter_for_active_buffer (GtkListStore *active_buffer, GtkTreeIter *iter, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); gboolean valid_iter; - GtkTreeModel *model = GTK_TREE_MODEL (priv->service_store); + GtkTreeModel *model = GTK_TREE_MODEL (self->priv->service_store); gtk_tree_model_get_iter_first (model, iter); for (valid_iter = gtk_tree_model_iter_next (model, iter); @@ -381,7 +313,7 @@ debug_window_get_iter_for_active_buffer (GtkListStore *active_buffer, return valid_iter; } -static void refresh_all_buffer (EmpathyDebugWindow *debug_window); +static void refresh_all_buffer (EmpathyDebugWindow *self); static void proxy_invalidated_cb (TpProxy *proxy, @@ -391,8 +323,7 @@ proxy_invalidated_cb (TpProxy *proxy, gpointer user_data) { EmpathyDebugWindow *self = (EmpathyDebugWindow *) user_data; - EmpathyDebugWindowPriv *priv = GET_PRIV (self); - GtkTreeModel *service_store = GTK_TREE_MODEL (priv->service_store); + GtkTreeModel *service_store = GTK_TREE_MODEL (self->priv->service_store); TpProxy *stored_proxy; GtkTreeIter iter; gboolean valid_iter; @@ -409,7 +340,7 @@ proxy_invalidated_cb (TpProxy *proxy, -1); if (proxy == stored_proxy) - gtk_list_store_set (priv->service_store, &iter, + gtk_list_store_set (self->priv->service_store, &iter, COL_PROXY, NULL, -1); } @@ -420,57 +351,55 @@ proxy_invalidated_cb (TpProxy *proxy, } static void -debug_window_get_messages_cb (TpProxy *proxy, - const GPtrArray *messages, - const GError *error, - gpointer user_data, - GObject *weak_object) +debug_window_get_messages_cb (GObject *object, + GAsyncResult *result, + gpointer user_data) { - EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data; - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); + TpDebugClient *debug = TP_DEBUG_CLIENT (object); + EmpathyDebugWindow *self = user_data; gchar *active_service_name; guint i; GtkListStore *active_buffer; gboolean valid_iter; GtkTreeIter iter; gchar *proxy_service_name; + GPtrArray *messages; + GError *error = NULL; - active_buffer = g_object_get_data (G_OBJECT (proxy), "active-buffer"); + active_buffer = g_object_get_data (object, "active-buffer"); valid_iter = debug_window_get_iter_for_active_buffer (active_buffer, &iter, - debug_window); - gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter, + self); + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->service_store), &iter, COL_NAME, &proxy_service_name, -1); - active_service_name = get_active_service_name (debug_window); - if (error != NULL) + active_service_name = get_active_service_name (self); + + messages = tp_debug_client_get_messages_finish (debug, result, &error); + if (messages == NULL) { - DEBUG ("GetMessages failed: %s", error->message); + DEBUG ("Failed to get debug messages: %s", error->message); + g_error_free (error); /* We want to set the window sensitivity to false only when proxy for the * selected service is unable to fetch debug messages */ if (!tp_strdiff (active_service_name, proxy_service_name)) - debug_window_set_toolbar_sensitivity (debug_window, FALSE); + debug_window_set_toolbar_sensitivity (self, FALSE); /* We created the proxy for GetMessages call. Now destroy it. */ - tp_clear_object (&proxy); + tp_clear_object (&debug); return; } DEBUG ("Retrieved debug messages for %s", active_service_name); g_free (active_service_name); - debug_window_set_toolbar_sensitivity (debug_window, TRUE); - + debug_window_set_toolbar_sensitivity (self, TRUE); for (i = 0; i < messages->len; i++) { - GValueArray *values = g_ptr_array_index (messages, i); + TpDebugMessage *msg = g_ptr_array_index (messages, i); - debug_window_add_message (debug_window, proxy, - g_value_get_double (g_value_array_get_nth (values, 0)), - g_value_get_string (g_value_array_get_nth (values, 1)), - g_value_get_uint (g_value_array_get_nth (values, 2)), - g_value_get_string (g_value_array_get_nth (values, 3))); + debug_window_add_message (self, debug, msg); } /* Now we save this precious proxy in the service_store along its service */ @@ -479,42 +408,43 @@ debug_window_get_messages_cb (TpProxy *proxy, DEBUG ("Proxy for service: %s was successful in fetching debug" " messages. Saving it.", proxy_service_name); - gtk_list_store_set (priv->service_store, &iter, - COL_PROXY, proxy, + gtk_list_store_set (self->priv->service_store, &iter, + COL_PROXY, debug, -1); } + g_ptr_array_unref (messages); g_free (proxy_service_name); /* Connect to "invalidated" signal */ - g_signal_connect (proxy, "invalidated", - G_CALLBACK (proxy_invalidated_cb), debug_window); + g_signal_connect (debug, "invalidated", + G_CALLBACK (proxy_invalidated_cb), self); /* Connect to NewDebugMessage */ - emp_cli_debug_connect_to_new_debug_message ( - proxy, debug_window_new_debug_message_cb, debug_window, - NULL, NULL, NULL); + tp_g_signal_connect_object (debug, "new-debug-message", + G_CALLBACK (debug_window_new_debug_message_cb), self, 0); /* Now that active-buffer is up to date, we can see which messages are * to be visible */ - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->store_filter)); + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER ( + self->priv->store_filter)); /* Set the proxy to signal for new debug messages */ - debug_window_set_enabled (proxy, TRUE); + debug_window_set_enabled (debug, TRUE); } static void -create_proxy_to_get_messages (EmpathyDebugWindow *debug_window, +create_proxy_to_get_messages (EmpathyDebugWindow *self, GtkTreeIter *iter, TpDBusDaemon *dbus) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); gchar *bus_name, *name = NULL; - TpProxy *new_proxy, *stored_proxy = NULL; + TpDebugClient *new_proxy, *stored_proxy = NULL; GtkTreeModel *pause_buffer, *active_buffer; gboolean gone; + GError *error = NULL; - gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), iter, + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->service_store), iter, COL_NAME, &name, COL_GONE, &gone, COL_ACTIVE_BUFFER, &active_buffer, @@ -535,13 +465,19 @@ create_proxy_to_get_messages (EmpathyDebugWindow *debug_window, DEBUG ("Preparing proxy to obtain messages for service %s", name); - gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), iter, + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->service_store), iter, COL_UNIQUE_NAME, &bus_name, -1); - new_proxy = g_object_new (TP_TYPE_PROXY, - "bus-name", bus_name, - "dbus-daemon", dbus, - "object-path", DEBUG_OBJECT_PATH, - NULL); + + new_proxy = tp_debug_client_new (dbus, bus_name, &error); + + if (new_proxy == NULL) + { + DEBUG ("Failed to create TpDebugClient on bus %s: %s", bus_name, + error->message); + g_free (bus_name); + goto finally; + } + g_free (bus_name); g_object_set_data (G_OBJECT (new_proxy), "active-buffer", active_buffer); @@ -552,10 +488,9 @@ create_proxy_to_get_messages (EmpathyDebugWindow *debug_window, * * Wasn't saved as last GetMessages call failed * * The service has newly arrived and no proxy has been prepared yet for it * * A service with the same name has reappeared but the owner maybe new */ - tp_proxy_add_interface_by_id (new_proxy, emp_iface_quark_debug ()); - emp_cli_debug_call_get_messages (new_proxy, -1, - debug_window_get_messages_cb, debug_window, NULL, NULL); + tp_debug_client_get_messages_async (TP_DEBUG_CLIENT (new_proxy), + debug_window_get_messages_cb, self); finally: g_free (name); @@ -564,16 +499,11 @@ finally: g_object_unref (pause_buffer); } -static GtkListStore* +static GtkListStore * new_list_store_for_service (void) { return gtk_list_store_new (NUM_DEBUG_COLS, - G_TYPE_DOUBLE, /* COL_DEBUG_TIMESTAMP */ - G_TYPE_STRING, /* COL_DEBUG_DOMAIN */ - G_TYPE_STRING, /* COL_DEBUG_CATEGORY */ - G_TYPE_STRING, /* COL_DEBUG_LEVEL_STRING */ - G_TYPE_STRING, /* COL_DEBUG_MESSAGE */ - G_TYPE_UINT); /* COL_DEBUG_LEVEL_VALUE */ + TP_TYPE_DEBUG_MESSAGE); /* COL_DEBUG_MESSAGE */ } static gboolean @@ -581,24 +511,26 @@ debug_window_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { - EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data; - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); - guint filter_value, level; + EmpathyDebugWindow *self = user_data; + GLogLevelFlags filter_value; GtkTreeModel *filter_model; GtkTreeIter filter_iter; + TpDebugMessage *msg; + gboolean result; - filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->level_filter)); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->level_filter), + filter_model = gtk_combo_box_get_model ( + GTK_COMBO_BOX (self->priv->level_filter)); + gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self->priv->level_filter), &filter_iter); - gtk_tree_model_get (model, iter, COL_DEBUG_LEVEL_VALUE, &level, -1); + gtk_tree_model_get (model, iter, COL_DEBUG_MESSAGE, &msg, -1); gtk_tree_model_get (filter_model, &filter_iter, COL_LEVEL_VALUE, &filter_value, -1); - if (level <= filter_value) - return TRUE; + result = (tp_debug_message_get_level (msg) <= filter_value); + g_object_unref (msg); - return FALSE; + return result; } static gboolean @@ -633,42 +565,40 @@ tree_view_search_equal_func_cb (GtkTreeModel *model, } static void -update_store_filter (EmpathyDebugWindow *debug_window, +update_store_filter (EmpathyDebugWindow *self, GtkListStore *active_buffer) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); - debug_window_set_toolbar_sensitivity (debug_window, FALSE); + debug_window_set_toolbar_sensitivity (self, FALSE); - tp_clear_object (&priv->store_filter); - priv->store_filter = gtk_tree_model_filter_new ( + tp_clear_object (&self->priv->store_filter); + self->priv->store_filter = gtk_tree_model_filter_new ( GTK_TREE_MODEL (active_buffer), NULL); gtk_tree_model_filter_set_visible_func ( - GTK_TREE_MODEL_FILTER (priv->store_filter), - debug_window_visible_func, debug_window, NULL); - gtk_tree_view_set_model (GTK_TREE_VIEW (priv->view), - priv->store_filter); + GTK_TREE_MODEL_FILTER (self->priv->store_filter), + debug_window_visible_func, self, NULL); + gtk_tree_view_set_model (GTK_TREE_VIEW (self->priv->view), + self->priv->store_filter); /* Since view's model has changed, reset the search column and * search_equal_func */ - gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->view), + gtk_tree_view_set_search_column (GTK_TREE_VIEW (self->priv->view), COL_DEBUG_MESSAGE); - gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (priv->view), + gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (self->priv->view), tree_view_search_equal_func_cb, NULL, NULL); - debug_window_set_toolbar_sensitivity (debug_window, TRUE); + debug_window_set_toolbar_sensitivity (self, TRUE); } static void -refresh_all_buffer (EmpathyDebugWindow *debug_window) +refresh_all_buffer (EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); gboolean valid_iter; GtkTreeIter iter; - GtkTreeModel *service_store = GTK_TREE_MODEL (priv->service_store); + GtkTreeModel *service_store = GTK_TREE_MODEL (self->priv->service_store); /* Clear All's active-buffer */ - gtk_list_store_clear (priv->all_active_buffer); + gtk_list_store_clear (self->priv->all_active_buffer); /* Skipping the first service store iter which is reserved for "All" */ gtk_tree_model_get_iter_first (service_store, &iter); @@ -689,7 +619,7 @@ refresh_all_buffer (EmpathyDebugWindow *debug_window) if (gone) { gtk_tree_model_foreach (GTK_TREE_MODEL (service_active_buffer), - copy_buffered_messages, priv->all_active_buffer); + copy_buffered_messages, self->priv->all_active_buffer); } else { @@ -700,7 +630,7 @@ refresh_all_buffer (EmpathyDebugWindow *debug_window) /* Copy the debug messages to all_active_buffer */ gtk_tree_model_foreach (GTK_TREE_MODEL (service_active_buffer), - copy_buffered_messages, priv->all_active_buffer); + copy_buffered_messages, self->priv->all_active_buffer); } else { @@ -713,7 +643,7 @@ refresh_all_buffer (EmpathyDebugWindow *debug_window) g_error_free (error); } - create_proxy_to_get_messages (debug_window, &iter, dbus); + create_proxy_to_get_messages (self, &iter, dbus); g_object_unref (dbus); } @@ -726,9 +656,8 @@ refresh_all_buffer (EmpathyDebugWindow *debug_window) static void debug_window_service_chooser_changed_cb (GtkComboBox *chooser, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); TpDBusDaemon *dbus; GError *error = NULL; GtkListStore *stored_active_buffer = NULL; @@ -740,16 +669,16 @@ debug_window_service_chooser_changed_cb (GtkComboBox *chooser, { DEBUG ("No CM is selected"); if (gtk_tree_model_iter_n_children ( - GTK_TREE_MODEL (priv->service_store), NULL) > 0) + GTK_TREE_MODEL (self->priv->service_store), NULL) > 0) { gtk_combo_box_set_active (chooser, 0); } return; } - debug_window_set_toolbar_sensitivity (debug_window, TRUE); + debug_window_set_toolbar_sensitivity (self, TRUE); - gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter, + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->service_store), &iter, COL_NAME, &name, COL_GONE, &gone, COL_ACTIVE_BUFFER, &stored_active_buffer, @@ -765,11 +694,11 @@ debug_window_service_chooser_changed_cb (GtkComboBox *chooser, if (!tp_strdiff (name, "All")) { - update_store_filter (debug_window, priv->all_active_buffer); + update_store_filter (self, self->priv->all_active_buffer); goto finally; } - update_store_filter (debug_window, stored_active_buffer); + update_store_filter (self, stored_active_buffer); dbus = tp_dbus_daemon_dup (&error); @@ -778,7 +707,7 @@ debug_window_service_chooser_changed_cb (GtkComboBox *chooser, DEBUG ("Failed at duping the dbus daemon: %s", error->message); } - create_proxy_to_get_messages (debug_window, &iter, dbus); + create_proxy_to_get_messages (self, &iter, dbus); g_object_unref (dbus); @@ -823,12 +752,11 @@ debug_window_service_foreach (GtkTreeModel *model, } static gboolean -debug_window_service_is_in_model (EmpathyDebugWindow *debug_window, +debug_window_service_is_in_model (EmpathyDebugWindow *self, const gchar *name, GtkTreeIter **iter, gboolean use_name) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); CmInModelForeachData *data; gboolean found; @@ -838,7 +766,7 @@ debug_window_service_is_in_model (EmpathyDebugWindow *debug_window, data->found_iter = iter; data->use_name = use_name; - gtk_tree_model_foreach (GTK_TREE_MODEL (priv->service_store), + gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->service_store), debug_window_service_foreach, data); found = data->found; @@ -852,26 +780,25 @@ static gchar * get_cm_display_name (EmpathyDebugWindow *self, const char *cm_name) { - EmpathyDebugWindowPriv *priv = GET_PRIV (self); GHashTable *protocols = g_hash_table_new (g_str_hash, g_str_equal); GList *accounts, *ptr; char *retval; - accounts = tp_account_manager_get_valid_accounts (priv->am); + accounts = tp_account_manager_dup_valid_accounts (self->priv->am); for (ptr = accounts; ptr != NULL; ptr = ptr->next) { TpAccount *account = TP_ACCOUNT (ptr->data); - if (!tp_strdiff (tp_account_get_connection_manager (account), cm_name)) + if (!tp_strdiff (tp_account_get_cm_name (account), cm_name)) { g_hash_table_insert (protocols, - (char *) tp_account_get_protocol (account), + (char *) tp_account_get_protocol_name (account), GUINT_TO_POINTER (TRUE)); } } - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); if (g_hash_table_size (protocols) > 0) { @@ -906,7 +833,7 @@ get_cm_display_name (EmpathyDebugWindow *self, typedef struct { - EmpathyDebugWindow *debug_window; + EmpathyDebugWindow *self; gchar *name; ServiceType type; } FillServiceChooserData; @@ -918,7 +845,7 @@ fill_service_chooser_data_new (EmpathyDebugWindow *window, { FillServiceChooserData * data = g_slice_new (FillServiceChooserData); - data->debug_window = window; + data->self = window; data->name = g_strdup (name); data->type = SERVICE_TYPE_CM; return data; @@ -931,6 +858,33 @@ fill_service_chooser_data_free (FillServiceChooserData *data) g_slice_free (FillServiceChooserData, data); } +static const gchar * +service_type_to_string (ServiceType type) +{ + switch (type) + { + case SERVICE_TYPE_CM: + return "CM"; + case SERVICE_TYPE_CLIENT: + return "Client"; + case SERVICE_TYPE_MC: + return "MC"; + } + + return "other"; +} + +static gchar * +service_dup_display_name (EmpathyDebugWindow *self, + ServiceType type, + const gchar *name) +{ + if (type == SERVICE_TYPE_CM) + return get_cm_display_name (self, name); + else + return g_strdup (name); +} + static void debug_window_get_name_owner_cb (TpDBusDaemon *proxy, const gchar *out, @@ -939,11 +893,10 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy, GObject *weak_object) { FillServiceChooserData *data = (FillServiceChooserData *) user_data; - EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (data->debug_window); - EmpathyDebugWindowPriv *priv = GET_PRIV (data->debug_window); + EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (data->self); GtkTreeIter iter; - priv->name_owner_cb_count++; + self->priv->name_owner_cb_count++; if (error != NULL) { @@ -951,24 +904,21 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy, goto OUT; } - if (!debug_window_service_is_in_model (data->debug_window, out, NULL, FALSE)) + if (!debug_window_service_is_in_model (data->self, out, NULL, FALSE)) { char *name; GtkListStore *active_buffer, *pause_buffer; DEBUG ("Adding %s to list: %s at unique name: %s", - data->type == SERVICE_TYPE_CM? "CM": "Client", + service_type_to_string (data->type), data->name, out); - if (data->type == SERVICE_TYPE_CM) - name = get_cm_display_name (self, data->name); - else - name = g_strdup (data->name); + name = service_dup_display_name (self, data->type, data->name); active_buffer = new_list_store_for_service (); pause_buffer = new_list_store_for_service (); - gtk_list_store_insert_with_values (priv->service_store, &iter, -1, + gtk_list_store_insert_with_values (self->priv->service_store, &iter, -1, COL_NAME, name, COL_UNIQUE_NAME, out, COL_GONE, FALSE, @@ -980,81 +930,37 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy, g_object_unref (active_buffer); g_object_unref (pause_buffer); - if (priv->select_name != NULL && - !tp_strdiff (name, priv->select_name)) + if (self->priv->select_name != NULL && + !tp_strdiff (name, self->priv->select_name)) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->chooser), &iter); - tp_clear_pointer (&priv->select_name, g_free); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self->priv->chooser), + &iter); + tp_clear_pointer (&self->priv->select_name, g_free); } g_free (name); } - if (priv->services_detected == priv->name_owner_cb_count) + if (self->priv->services_detected == self->priv->name_owner_cb_count) { /* Time to add "All" selection to service_store */ - gtk_list_store_insert_with_values (priv->service_store, &iter, 0, + gtk_list_store_insert_with_values (self->priv->service_store, &iter, 0, COL_NAME, "All", COL_ACTIVE_BUFFER, NULL, -1); - priv->all_active_buffer = new_list_store_for_service (); + self->priv->all_active_buffer = new_list_store_for_service (); /* Populate active buffers for all services */ refresh_all_buffer (self); - gtk_combo_box_set_active (GTK_COMBO_BOX (priv->chooser), 0); + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->chooser), 0); } OUT: fill_service_chooser_data_free (data); } -static void -debug_window_list_connection_names_cb (const gchar * const *names, - gsize n, - const gchar * const *cms, - const gchar * const *protocols, - const GError *error, - gpointer user_data, - GObject *weak_object) -{ - EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data; - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); - guint i; - TpDBusDaemon *dbus; - GError *error2 = NULL; - - if (error != NULL) - { - DEBUG ("list_connection_names failed: %s", error->message); - return; - } - - dbus = tp_dbus_daemon_dup (&error2); - - if (error2 != NULL) - { - DEBUG ("Failed to dup TpDBusDaemon."); - g_error_free (error2); - return; - } - - for (i = 0; cms[i] != NULL; i++) - { - FillServiceChooserData *data = fill_service_chooser_data_new ( - debug_window, cms[i], SERVICE_TYPE_CM); - - tp_cli_dbus_daemon_call_get_name_owner (dbus, -1, - names[i], debug_window_get_name_owner_cb, - data, NULL, NULL); - - priv->services_detected ++; - } - - g_object_unref (dbus); -} - static void debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, const gchar *arg0, @@ -1064,7 +970,6 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, GObject *weak_object) { EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (user_data); - EmpathyDebugWindowPriv *priv = GET_PRIV (user_data); ServiceType type; const gchar *name; @@ -1083,15 +988,12 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, return; } - if (EMP_STR_EMPTY (arg1) && !EMP_STR_EMPTY (arg2)) + if (TPAW_STR_EMPTY (arg1) && !TPAW_STR_EMPTY (arg2)) { GtkTreeIter *found_at_iter = NULL; gchar *display_name; - if (type == SERVICE_TYPE_CM) - display_name = get_cm_display_name (self, name); - else - display_name = g_strdup (name); + display_name = service_dup_display_name (self, type, name); /* A service joined */ if (!debug_window_service_is_in_model (user_data, display_name, @@ -1105,7 +1007,8 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, active_buffer = new_list_store_for_service (); pause_buffer = new_list_store_for_service (); - gtk_list_store_insert_with_values (priv->service_store, &iter, -1, + gtk_list_store_insert_with_values (self->priv->service_store, + &iter, -1, COL_NAME, display_name, COL_UNIQUE_NAME, arg2, COL_GONE, FALSE, @@ -1130,12 +1033,12 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, active_buffer= new_list_store_for_service (); pause_buffer = new_list_store_for_service (); - gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->service_store), found_at_iter, COL_PROXY, &stored_proxy, -1); tp_clear_object (&stored_proxy); - gtk_list_store_set (priv->service_store, found_at_iter, + gtk_list_store_set (self->priv->service_store, found_at_iter, COL_NAME, display_name, COL_UNIQUE_NAME, arg2, COL_GONE, FALSE, @@ -1150,7 +1053,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, gtk_tree_iter_free (found_at_iter); debug_window_service_chooser_changed_cb - (GTK_COMBO_BOX (priv->chooser), user_data); + (GTK_COMBO_BOX (self->priv->chooser), user_data); } /* If a new service arrives when "All" is selected, the view will @@ -1162,7 +1065,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, g_free (display_name); } - else if (!EMP_STR_EMPTY (arg1) && EMP_STR_EMPTY (arg2)) + else if (!TPAW_STR_EMPTY (arg1) && TPAW_STR_EMPTY (arg2)) { /* A service died */ GtkTreeIter *iter = NULL; @@ -1172,7 +1075,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, /* set the service as disabled in the model */ if (debug_window_service_is_in_model (user_data, arg1, &iter, FALSE)) { - gtk_list_store_set (priv->service_store, + gtk_list_store_set (self->priv->service_store, iter, COL_GONE, TRUE, -1); gtk_tree_iter_free (iter); } @@ -1183,21 +1086,19 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy, } static void -add_client (EmpathyDebugWindow *self, - const gchar *name) +add_service (EmpathyDebugWindow *self, + const gchar *bus_name, + const gchar *display_name, + ServiceType type) { - EmpathyDebugWindowPriv *priv = GET_PRIV (self); - const gchar *suffix; FillServiceChooserData *data; - suffix = name + strlen (TP_CLIENT_BUS_NAME_BASE); + data = fill_service_chooser_data_new (self, display_name, type); - data = fill_service_chooser_data_new (self, suffix, SERVICE_TYPE_CLIENT); + tp_cli_dbus_daemon_call_get_name_owner (self->priv->dbus, -1, + bus_name, debug_window_get_name_owner_cb, data, NULL, NULL); - tp_cli_dbus_daemon_call_get_name_owner (priv->dbus, -1, - name, debug_window_get_name_owner_cb, data, NULL, NULL); - - priv->services_detected ++; + self->priv->services_detected ++; } static void @@ -1220,20 +1121,27 @@ list_names_cb (TpDBusDaemon *bus_daemon, { if (g_str_has_prefix (names[i], TP_CLIENT_BUS_NAME_BASE)) { - add_client (self, names[i]); + add_service (self, names[i], + names[i] + strlen (TP_CLIENT_BUS_NAME_BASE), SERVICE_TYPE_CLIENT); + } + else if (g_str_has_prefix (names[i], TP_CM_BUS_NAME_BASE)) + { + add_service (self, names[i], + names[i] + strlen (TP_CM_BUS_NAME_BASE), SERVICE_TYPE_CM); + } + else if (!tp_strdiff (names[i], TP_ACCOUNT_MANAGER_BUS_NAME)) + { + add_service (self, names[i], "Mission-Control", SERVICE_TYPE_MC); } } } static void -debug_window_fill_service_chooser (EmpathyDebugWindow *debug_window) +debug_window_fill_service_chooser (EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); GError *error = NULL; - GtkTreeIter iter; - GtkListStore *active_buffer, *pause_buffer; - priv->dbus = tp_dbus_daemon_dup (&error); + self->priv->dbus = tp_dbus_daemon_dup (&error); if (error != NULL) { @@ -1243,52 +1151,31 @@ debug_window_fill_service_chooser (EmpathyDebugWindow *debug_window) } /* Keep a count of the services detected and added */ - priv->services_detected = 0; - priv->name_owner_cb_count = 0; - - /* Add CMs to list */ - tp_list_connection_names (priv->dbus, debug_window_list_connection_names_cb, - debug_window, NULL, NULL); - - /* add Mission Control */ - active_buffer= new_list_store_for_service (); - pause_buffer = new_list_store_for_service (); - - gtk_list_store_insert_with_values (priv->service_store, &iter, -1, - COL_NAME, "mission-control", - COL_UNIQUE_NAME, "org.freedesktop.Telepathy.MissionControl5", - COL_GONE, FALSE, - COL_ACTIVE_BUFFER, active_buffer, - COL_PAUSE_BUFFER, pause_buffer, - COL_PROXY, NULL, - -1); - g_object_unref (active_buffer); - g_object_unref (pause_buffer); + self->priv->services_detected = 0; + self->priv->name_owner_cb_count = 0; - /* add clients */ - tp_dbus_daemon_list_names (priv->dbus, 2000, - list_names_cb, NULL, NULL, G_OBJECT (debug_window)); + tp_dbus_daemon_list_names (self->priv->dbus, 2000, + list_names_cb, NULL, NULL, G_OBJECT (self)); - priv->name_owner_changed_signal = - tp_cli_dbus_daemon_connect_to_name_owner_changed (priv->dbus, - debug_window_name_owner_changed_cb, debug_window, NULL, NULL, NULL); + self->priv->name_owner_changed_signal = + tp_cli_dbus_daemon_connect_to_name_owner_changed (self->priv->dbus, + debug_window_name_owner_changed_cb, self, NULL, NULL, NULL); } static void debug_window_pause_toggled_cb (GtkToggleToolButton *pause_, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); GtkTreeIter iter; gboolean valid_iter; - GtkTreeModel *model = GTK_TREE_MODEL (priv->service_store); + GtkTreeModel *model = GTK_TREE_MODEL (self->priv->service_store); - priv->paused = gtk_toggle_tool_button_get_active (pause_); + self->priv->paused = gtk_toggle_tool_button_get_active (pause_); - if (!priv->paused) + if (!self->priv->paused) { /* Pause has been released - flush all pause buffers */ - GtkTreeModel *service_store = GTK_TREE_MODEL (priv->service_store); + GtkTreeModel *service_store = GTK_TREE_MODEL (self->priv->service_store); /* Skipping the first iter which is reserved for "All" */ gtk_tree_model_get_iter_first (model, &iter); @@ -1306,7 +1193,7 @@ debug_window_pause_toggled_cb (GtkToggleToolButton *pause_, gtk_tree_model_foreach (GTK_TREE_MODEL (pause_buffer), copy_buffered_messages, active_buffer); gtk_tree_model_foreach (GTK_TREE_MODEL (pause_buffer), - copy_buffered_messages, priv->all_active_buffer); + copy_buffered_messages, self->priv->all_active_buffer); gtk_list_store_clear (pause_buffer); @@ -1318,24 +1205,30 @@ debug_window_pause_toggled_cb (GtkToggleToolButton *pause_, static void debug_window_filter_changed_cb (GtkComboBox *filter, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); - gtk_tree_model_filter_refilter ( - GTK_TREE_MODEL_FILTER (priv->store_filter)); + GTK_TREE_MODEL_FILTER (self->priv->store_filter)); } static void debug_window_clear_clicked_cb (GtkToolButton *clear_button, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); GtkTreeIter iter; GtkListStore *active_buffer; - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->chooser), &iter); - gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter, + /* "All" is the first choice in the service chooser and it's buffer is + * not saved in the service-store but is accessed using a self->private + * reference */ + if (gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->chooser)) == 0) + { + gtk_list_store_clear (self->priv->all_active_buffer); + return; + } + + gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self->priv->chooser), &iter); + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->service_store), &iter, COL_ACTIVE_BUFFER, &active_buffer, -1); gtk_list_store_clear (active_buffer); @@ -1345,16 +1238,16 @@ debug_window_clear_clicked_cb (GtkToolButton *clear_button, static void debug_window_menu_copy_activate_cb (GtkMenuItem *menu_item, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); GtkTreePath *path; GtkTreeViewColumn *focus_column; GtkTreeIter iter; - gchar *message; + TpDebugMessage *msg; + const gchar *message; GtkClipboard *clipboard; - gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->view), + gtk_tree_view_get_cursor (GTK_TREE_VIEW (self->priv->view), &path, &focus_column); if (path == NULL) @@ -1363,13 +1256,15 @@ debug_window_menu_copy_activate_cb (GtkMenuItem *menu_item, return; } - gtk_tree_model_get_iter (priv->store_filter, &iter, path); + gtk_tree_model_get_iter (self->priv->store_filter, &iter, path); - gtk_tree_model_get (priv->store_filter, &iter, - COL_DEBUG_MESSAGE, &message, + gtk_tree_model_get (self->priv->store_filter, &iter, + COL_DEBUG_MESSAGE, &msg, -1); - if (EMP_STR_EMPTY (message)) + message = tp_debug_message_get_message (msg); + + if (TPAW_STR_EMPTY (message)) { DEBUG ("Log message is empty"); return; @@ -1381,12 +1276,12 @@ debug_window_menu_copy_activate_cb (GtkMenuItem *menu_item, gtk_clipboard_set_text (clipboard, message, -1); - g_free (message); + g_object_unref (msg); } typedef struct { - EmpathyDebugWindow *debug_window; + EmpathyDebugWindow *self; guint button; guint32 time; } MenuPopupData; @@ -1398,13 +1293,13 @@ debug_window_show_menu (gpointer user_data) GtkWidget *menu, *item; GtkMenuShell *shell; - menu = empathy_context_menu_new (GTK_WIDGET (data->debug_window)); + menu = empathy_context_menu_new (GTK_WIDGET (data->self)); shell = GTK_MENU_SHELL (menu); item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL); g_signal_connect (item, "activate", - G_CALLBACK (debug_window_menu_copy_activate_cb), data->debug_window); + G_CALLBACK (debug_window_menu_copy_activate_cb), data->self); gtk_menu_shell_append (shell, item); gtk_widget_show (item); @@ -1429,7 +1324,7 @@ debug_window_button_press_event_cb (GtkTreeView *view, /* The tree view was right-clicked. (3 == third mouse button) */ MenuPopupData *data; data = g_slice_new0 (MenuPopupData); - data->debug_window = user_data; + data->self = user_data; data->button = event->button; data->time = event->time; g_idle_add (debug_window_show_menu, data); @@ -1439,25 +1334,20 @@ debug_window_button_press_event_cb (GtkTreeView *view, } static gchar * -debug_window_format_timestamp (gdouble timestamp) +debug_window_format_timestamp (TpDebugMessage *msg) { - struct tm *tstruct; - char time_str[32]; + GDateTime *t; + gchar *time_str, *text; gint ms; - time_t sec; - gchar *text; - ms = (int) ((timestamp - (int) timestamp)*1e6); - sec = (long) timestamp; - tstruct = localtime ((time_t *) &sec); - if (!strftime (time_str, sizeof (time_str), "%x %T", tstruct)) - { - DEBUG ("Failed to format timestamp: %e", timestamp); - time_str[0] = '\0'; - } + t = tp_debug_message_get_time (msg); + time_str = g_date_time_format (t, "%x %T"); + + ms = g_date_time_get_microsecond (t); text = g_strdup_printf ("%s.%d", time_str, ms); + g_free (time_str); return text; } @@ -1468,62 +1358,131 @@ debug_window_time_formatter (GtkTreeViewColumn *tree_column, GtkTreeIter *iter, gpointer data) { - gdouble timestamp; + TpDebugMessage *msg; gchar *time_str; - gtk_tree_model_get (tree_model, iter, COL_DEBUG_TIMESTAMP, ×tamp, -1); + gtk_tree_model_get (tree_model, iter, COL_DEBUG_MESSAGE, &msg, -1); - time_str = debug_window_format_timestamp (timestamp); + time_str = debug_window_format_timestamp (msg); g_object_set (G_OBJECT (cell), "text", time_str, NULL); - g_free (time_str); + g_object_unref (msg); +} + +static void +debug_window_domain_formatter (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + TpDebugMessage *msg; + + gtk_tree_model_get (tree_model, iter, COL_DEBUG_MESSAGE, &msg, -1); + + g_object_set (G_OBJECT (cell), "text", tp_debug_message_get_domain (msg), + NULL); + + g_object_unref (msg); +} + +static void +debug_window_category_formatter (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + TpDebugMessage *msg; + const gchar *category; + + gtk_tree_model_get (tree_model, iter, COL_DEBUG_MESSAGE, &msg, -1); + + category = tp_debug_message_get_category (msg); + + g_object_set (G_OBJECT (cell), "text", category ? category : "", NULL); + + g_object_unref (msg); +} + +static void +debug_window_message_formatter (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + TpDebugMessage *msg; + + gtk_tree_model_get (tree_model, iter, COL_DEBUG_MESSAGE, &msg, -1); + + g_object_set (G_OBJECT (cell), "text", + tp_debug_message_get_message (msg), NULL); + + g_object_unref (msg); +} + +static void +debug_window_level_formatter (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + TpDebugMessage *msg; + const gchar *level; + + gtk_tree_model_get (tree_model, iter, COL_DEBUG_MESSAGE, &msg, -1); + + level = log_level_to_string (tp_debug_message_get_level (msg)); + + g_object_set (G_OBJECT (cell), "text", level, NULL); + + g_object_unref (msg); } static gboolean -debug_window_store_filter_foreach (GtkTreeModel *model, +debug_window_copy_model_foreach (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data) { - gchar **debug_data = (gchar **)user_data; - gchar *domain, *category, *message, *level_str, *level_upper; - gdouble timestamp; - gchar *line, *time_str, *tmp; + gchar **text = (gchar **) user_data; + gchar *tmp; + gchar *level_upper; + const gchar *level_str, *category; + gchar *line, *time_str; + TpDebugMessage *msg; + + if (*text == NULL) + *text = g_strdup (""); gtk_tree_model_get (model, iter, - COL_DEBUG_TIMESTAMP, ×tamp, - COL_DEBUG_DOMAIN, &domain, - COL_DEBUG_CATEGORY, &category, - COL_DEBUG_LEVEL_STRING, &level_str, - COL_DEBUG_MESSAGE, &message, + COL_DEBUG_MESSAGE, &msg, -1); + level_str = log_level_to_string (tp_debug_message_get_level (msg)); level_upper = g_ascii_strup (level_str, -1); - time_str = debug_window_format_timestamp (timestamp); + time_str = debug_window_format_timestamp (msg); + category = tp_debug_message_get_category (msg); line = g_strdup_printf ("%s%s%s-%s: %s: %s\n", - domain, EMP_STR_EMPTY (category) ? "" : "/", - category, level_upper, time_str, message); + tp_debug_message_get_domain (msg), + category ? "" : "/", category ? category : "", + level_upper, time_str, tp_debug_message_get_message (msg)); g_free (time_str); - /* Compact all message lines in the out parameter debug_data */ - if (!tp_str_empty (*debug_data)) - tmp = g_strconcat (*debug_data, line, NULL); - else - tmp = g_strdup (line); - - g_free (*debug_data); - *debug_data = tmp; + tmp = g_strconcat (*text, line, NULL); + g_free (*text); g_free (line); g_free (level_upper); - g_free (level_str); - g_free (domain); - g_free (category); - g_free (message); + g_object_unref (msg); + + *text = tmp; return FALSE; } @@ -1531,9 +1490,8 @@ debug_window_store_filter_foreach (GtkTreeModel *model, static void debug_window_save_file_chooser_response_cb (GtkDialog *dialog, gint response_id, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); gchar *filename = NULL; GFile *gfile = NULL; gchar *debug_data = NULL; @@ -1559,8 +1517,8 @@ debug_window_save_file_chooser_response_cb (GtkDialog *dialog, goto OUT; } - gtk_tree_model_foreach (priv->store_filter, - debug_window_store_filter_foreach, &debug_data); + gtk_tree_model_foreach (self->priv->store_filter, + debug_window_copy_model_foreach, &debug_data); g_output_stream_write (G_OUTPUT_STREAM (output_stream), debug_data, strlen (debug_data), NULL, &file_write_error); @@ -1587,7 +1545,7 @@ OUT: static void debug_window_save_clicked_cb (GtkToolButton *tool_button, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { GtkWidget *file_chooser; gchar *name, *tmp = NULL; @@ -1596,7 +1554,7 @@ debug_window_save_clicked_cb (GtkToolButton *tool_button, struct tm *tm_s; file_chooser = gtk_file_chooser_dialog_new (_("Save"), - GTK_WINDOW (debug_window), GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_WINDOW (self), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); @@ -1608,13 +1566,13 @@ debug_window_save_clicked_cb (GtkToolButton *tool_button, gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_chooser), g_get_home_dir ()); - name = get_active_service_name (debug_window); + name = get_active_service_name (self); t = time (NULL); tm_s = localtime (&t); if (tm_s != NULL) { - if (strftime(time_str, sizeof (time_str), "%d-%m-%y_%H-%M-%S", tm_s)) + if (strftime (time_str, sizeof (time_str), "%d-%m-%y_%H-%M-%S", tm_s)) tmp = g_strdup_printf ("%s-%s.log", name, time_str); } @@ -1627,7 +1585,7 @@ debug_window_save_clicked_cb (GtkToolButton *tool_button, g_signal_connect (file_chooser, "response", G_CALLBACK (debug_window_save_file_chooser_response_cb), - debug_window); + self); gtk_widget_show (file_chooser); } @@ -1645,7 +1603,7 @@ debug_window_pastebin_response_dialog_closed_cb (GtkDialog *dialog, static void debug_window_pastebin_callback (SoupSession *session, SoupMessage *msg, - gpointer debug_window) + gpointer self) { GtkWidget *dialog; SoupBuffer *buffer; @@ -1653,7 +1611,7 @@ debug_window_pastebin_callback (SoupSession *session, buffer = soup_message_body_flatten (msg->response_body); if (g_str_has_prefix (buffer->data, "http://pastebin.com/")) { - dialog = gtk_message_dialog_new (GTK_WINDOW (debug_window), + dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Pastebin link")); @@ -1662,13 +1620,13 @@ debug_window_pastebin_callback (SoupSession *session, } else { - dialog = gtk_message_dialog_new (GTK_WINDOW (debug_window), + dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Pastebin response")); if (!tp_str_empty (buffer->data)) gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - _("%s"), buffer->data); + "%s", buffer->data); else gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Data too large for a single paste. Please save logs to file.")); @@ -1676,7 +1634,7 @@ debug_window_pastebin_callback (SoupSession *session, g_object_unref (session); - gtk_window_set_transient_for (GTK_WINDOW (dialog), debug_window); + gtk_window_set_transient_for (GTK_WINDOW (dialog), self); gtk_widget_show_all (GTK_WIDGET (dialog)); @@ -1685,26 +1643,26 @@ debug_window_pastebin_callback (SoupSession *session, } static void -debug_window_message_dialog (EmpathyDebugWindow *debug_window, +debug_window_message_dialog (EmpathyDebugWindow *self, const gchar *primary_text, const gchar *secondary_text) { GtkWidget *dialog; - dialog = gtk_message_dialog_new (GTK_WINDOW (debug_window), + dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", _(primary_text)); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", _(secondary_text)); gtk_window_set_transient_for (GTK_WINDOW (dialog), - GTK_WINDOW (debug_window)); + GTK_WINDOW (self)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } static void -debug_window_send_to_pastebin (EmpathyDebugWindow *debug_window, +debug_window_send_to_pastebin (EmpathyDebugWindow *self, gchar *debug_data) { SoupSession *session; @@ -1713,7 +1671,7 @@ debug_window_send_to_pastebin (EmpathyDebugWindow *debug_window, if (tp_str_empty (debug_data)) { - debug_window_message_dialog (debug_window, "Error", "No data to send"); + debug_window_message_dialog (self, "Error", "No data to send"); return; } @@ -1742,81 +1700,32 @@ debug_window_send_to_pastebin (EmpathyDebugWindow *debug_window, g_free (formdata); soup_session_queue_message (session, msg, debug_window_pastebin_callback, - debug_window); + self); } static void debug_window_send_to_pastebin_cb (GtkToolButton *tool_button, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); gchar *debug_data = NULL; DEBUG ("Preparing debug data for sending to pastebin."); - gtk_tree_model_foreach (priv->store_filter, - debug_window_store_filter_foreach, &debug_data); + gtk_tree_model_foreach (self->priv->store_filter, + debug_window_copy_model_foreach, &debug_data); - debug_window_send_to_pastebin (debug_window, debug_data); + debug_window_send_to_pastebin (self, debug_data); g_free (debug_data); } -static gboolean -debug_window_copy_model_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) -{ - gchar **text = (gchar **) user_data; - gchar *tmp; - gchar *domain, *category, *message, *level_str, *level_upper; - gdouble timestamp; - gchar *line, *time_str; - - gtk_tree_model_get (model, iter, - COL_DEBUG_TIMESTAMP, ×tamp, - COL_DEBUG_DOMAIN, &domain, - COL_DEBUG_CATEGORY, &category, - COL_DEBUG_LEVEL_STRING, &level_str, - COL_DEBUG_MESSAGE, &message, - -1); - - level_upper = g_ascii_strup (level_str, -1); - - time_str = debug_window_format_timestamp (timestamp); - - line = g_strdup_printf ("%s%s%s-%s: %s: %s\n", - domain, EMP_STR_EMPTY (category) ? "" : "/", - category, level_upper, time_str, message); - - g_free (time_str); - - tmp = g_strconcat (*text, line, NULL); - - g_free (*text); - g_free (line); - g_free (level_upper); - g_free (level_str); - g_free (domain); - g_free (category); - g_free (message); - - *text = tmp; - - return FALSE; -} - static void debug_window_copy_clicked_cb (GtkToolButton *tool_button, - EmpathyDebugWindow *debug_window) + EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window); GtkClipboard *clipboard; - gchar *text; - - text = g_strdup (""); + gchar *text = NULL; - gtk_tree_model_foreach (priv->store_filter, + gtk_tree_model_foreach (self->priv->store_filter, debug_window_copy_model_foreach, &text); clipboard = gtk_clipboard_get_for_display ( @@ -1850,8 +1759,7 @@ static void empathy_debug_window_select_name (EmpathyDebugWindow *self, const gchar *name) { - EmpathyDebugWindowPriv *priv = GET_PRIV (self); - GtkTreeModel *model = GTK_TREE_MODEL (priv->service_store); + GtkTreeModel *model = GTK_TREE_MODEL (self->priv->service_store); GtkTreeIter iter; gchar *iter_name; gboolean valid, found = FALSE; @@ -1874,7 +1782,7 @@ empathy_debug_window_select_name (EmpathyDebugWindow *self, } if (found) - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->chooser), &iter); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self->priv->chooser), &iter); } static void @@ -1882,8 +1790,8 @@ am_prepared_cb (GObject *am, GAsyncResult *res, gpointer user_data) { + EmpathyDebugWindow *self = user_data; GObject *object = user_data; - EmpathyDebugWindowPriv *priv = GET_PRIV (object); GtkWidget *vbox; GtkWidget *toolbar; GtkWidget *image; @@ -1893,6 +1801,7 @@ am_prepared_cb (GObject *am, GtkListStore *level_store; GtkTreeIter iter; GError *error = NULL; + GtkWidget *infobar, *content; if (!tp_proxy_prepare_finish (am, res, &error)) { @@ -1900,8 +1809,10 @@ am_prepared_cb (GObject *am, g_clear_error (&error); } + empathy_set_css_provider (GTK_WIDGET (object)); + gtk_window_set_title (GTK_WINDOW (object), _("Debug Window")); - gtk_window_set_default_size (GTK_WINDOW (object), 800, 400); + gtk_widget_set_size_request (GTK_WIDGET (object), 600, 300); empathy_geometry_bind (GTK_WINDOW (object), "debug-window"); g_signal_connect (object, "key-press-event", @@ -1923,194 +1834,240 @@ am_prepared_cb (GObject *am, gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0); /* CM */ - priv->chooser = gtk_combo_box_text_new (); - priv->service_store = gtk_list_store_new (NUM_COLS, + self->priv->chooser = gtk_combo_box_text_new (); + self->priv->service_store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING, /* COL_NAME */ G_TYPE_STRING, /* COL_UNIQUE_NAME */ G_TYPE_BOOLEAN, /* COL_GONE */ G_TYPE_OBJECT, /* COL_ACTIVE_BUFFER */ G_TYPE_OBJECT, /* COL_PAUSE_BUFFER */ TP_TYPE_PROXY); /* COL_PROXY */ - gtk_combo_box_set_model (GTK_COMBO_BOX (priv->chooser), - GTK_TREE_MODEL (priv->service_store)); - gtk_widget_show (priv->chooser); + gtk_combo_box_set_model (GTK_COMBO_BOX (self->priv->chooser), + GTK_TREE_MODEL (self->priv->service_store)); + gtk_widget_show (self->priv->chooser); item = gtk_tool_item_new (); gtk_widget_show (GTK_WIDGET (item)); - gtk_container_add (GTK_CONTAINER (item), priv->chooser); + gtk_container_add (GTK_CONTAINER (item), self->priv->chooser); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); - g_signal_connect (priv->chooser, "changed", + g_signal_connect (self->priv->chooser, "changed", G_CALLBACK (debug_window_service_chooser_changed_cb), object); - gtk_widget_show (GTK_WIDGET (priv->chooser)); + gtk_widget_show (GTK_WIDGET (self->priv->chooser)); item = gtk_separator_tool_item_new (); gtk_widget_show (GTK_WIDGET (item)); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); /* Save */ - priv->save_button = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE); - g_signal_connect (priv->save_button, "clicked", + self->priv->save_button = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE); + g_signal_connect (self->priv->save_button, "clicked", G_CALLBACK (debug_window_save_clicked_cb), object); - gtk_widget_show (GTK_WIDGET (priv->save_button)); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->save_button), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->save_button, -1); + gtk_widget_show (GTK_WIDGET (self->priv->save_button)); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (self->priv->save_button), + TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->save_button, -1); /* Send to pastebin */ - priv->send_to_pastebin = gtk_tool_button_new_from_stock (GTK_STOCK_PASTE); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->send_to_pastebin), + self->priv->send_to_pastebin = gtk_tool_button_new_from_stock ( + GTK_STOCK_PASTE); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (self->priv->send_to_pastebin), _("Send to pastebin")); - g_signal_connect (priv->send_to_pastebin, "clicked", + g_signal_connect (self->priv->send_to_pastebin, "clicked", G_CALLBACK (debug_window_send_to_pastebin_cb), object); - gtk_widget_show (GTK_WIDGET (priv->send_to_pastebin)); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->send_to_pastebin), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->send_to_pastebin, -1); + gtk_widget_show (GTK_WIDGET (self->priv->send_to_pastebin)); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (self->priv->send_to_pastebin), + TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->send_to_pastebin, -1); /* Copy */ - priv->copy_button = gtk_tool_button_new_from_stock (GTK_STOCK_COPY); - g_signal_connect (priv->copy_button, "clicked", + self->priv->copy_button = gtk_tool_button_new_from_stock (GTK_STOCK_COPY); + g_signal_connect (self->priv->copy_button, "clicked", G_CALLBACK (debug_window_copy_clicked_cb), object); - gtk_widget_show (GTK_WIDGET (priv->copy_button)); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->copy_button), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->copy_button, -1); + gtk_widget_show (GTK_WIDGET (self->priv->copy_button)); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (self->priv->copy_button), + TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->copy_button, -1); /* Clear */ - priv->clear_button = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); - g_signal_connect (priv->clear_button, "clicked", + self->priv->clear_button = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); + g_signal_connect (self->priv->clear_button, "clicked", G_CALLBACK (debug_window_clear_clicked_cb), object); - gtk_widget_show (GTK_WIDGET (priv->clear_button)); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->clear_button), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->clear_button, -1); + gtk_widget_show (GTK_WIDGET (self->priv->clear_button)); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (self->priv->clear_button), + TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->clear_button, -1); item = gtk_separator_tool_item_new (); gtk_widget_show (GTK_WIDGET (item)); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); /* Pause */ - priv->paused = FALSE; + self->priv->paused = FALSE; image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PAUSE, GTK_ICON_SIZE_MENU); gtk_widget_show (image); - priv->pause_button = gtk_toggle_tool_button_new (); + self->priv->pause_button = gtk_toggle_tool_button_new (); gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->pause_button), priv->paused); - g_signal_connect (priv->pause_button, "toggled", + GTK_TOGGLE_TOOL_BUTTON (self->priv->pause_button), self->priv->paused); + g_signal_connect (self->priv->pause_button, "toggled", G_CALLBACK (debug_window_pause_toggled_cb), object); - gtk_widget_show (GTK_WIDGET (priv->pause_button)); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->pause_button), TRUE); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->pause_button), _("Pause")); + gtk_widget_show (GTK_WIDGET (self->priv->pause_button)); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (self->priv->pause_button), + TRUE); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (self->priv->pause_button), + _("Pause")); gtk_tool_button_set_icon_widget ( - GTK_TOOL_BUTTON (priv->pause_button), image); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->pause_button, -1); + GTK_TOOL_BUTTON (self->priv->pause_button), image); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->pause_button, -1); item = gtk_separator_tool_item_new (); gtk_widget_show (GTK_WIDGET (item)); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); /* Level */ - priv->level_label = gtk_tool_item_new (); - gtk_widget_show (GTK_WIDGET (priv->level_label)); + self->priv->level_label = gtk_tool_item_new (); + gtk_widget_show (GTK_WIDGET (self->priv->level_label)); label = gtk_label_new (_("Level ")); gtk_widget_show (label); - gtk_container_add (GTK_CONTAINER (priv->level_label), label); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->level_label, -1); + gtk_container_add (GTK_CONTAINER (self->priv->level_label), label); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->level_label, -1); - priv->level_filter = gtk_combo_box_text_new (); - gtk_widget_show (priv->level_filter); + self->priv->level_filter = gtk_combo_box_text_new (); + gtk_widget_show (self->priv->level_filter); item = gtk_tool_item_new (); gtk_widget_show (GTK_WIDGET (item)); - gtk_container_add (GTK_CONTAINER (item), priv->level_filter); + gtk_container_add (GTK_CONTAINER (item), self->priv->level_filter); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); level_store = gtk_list_store_new (NUM_COLS_LEVEL, G_TYPE_STRING, G_TYPE_UINT); - gtk_combo_box_set_model (GTK_COMBO_BOX (priv->level_filter), + gtk_combo_box_set_model (GTK_COMBO_BOX (self->priv->level_filter), GTK_TREE_MODEL (level_store)); gtk_list_store_insert_with_values (level_store, &iter, -1, COL_LEVEL_NAME, _("Debug"), - COL_LEVEL_VALUE, TP_DEBUG_LEVEL_DEBUG, + COL_LEVEL_VALUE, G_LOG_LEVEL_DEBUG, -1); gtk_list_store_insert_with_values (level_store, &iter, -1, COL_LEVEL_NAME, _("Info"), - COL_LEVEL_VALUE, TP_DEBUG_LEVEL_INFO, + COL_LEVEL_VALUE, G_LOG_LEVEL_INFO, -1); gtk_list_store_insert_with_values (level_store, &iter, -1, COL_LEVEL_NAME, _("Message"), - COL_LEVEL_VALUE, TP_DEBUG_LEVEL_MESSAGE, + COL_LEVEL_VALUE, G_LOG_LEVEL_MESSAGE, -1); gtk_list_store_insert_with_values (level_store, &iter, -1, COL_LEVEL_NAME, _("Warning"), - COL_LEVEL_VALUE, TP_DEBUG_LEVEL_WARNING, + COL_LEVEL_VALUE, G_LOG_LEVEL_WARNING, -1); gtk_list_store_insert_with_values (level_store, &iter, -1, COL_LEVEL_NAME, _("Critical"), - COL_LEVEL_VALUE, TP_DEBUG_LEVEL_CRITICAL, + COL_LEVEL_VALUE, G_LOG_LEVEL_CRITICAL, -1); gtk_list_store_insert_with_values (level_store, &iter, -1, COL_LEVEL_NAME, _("Error"), - COL_LEVEL_VALUE, TP_DEBUG_LEVEL_ERROR, + COL_LEVEL_VALUE, G_LOG_LEVEL_ERROR, -1); - gtk_combo_box_set_active (GTK_COMBO_BOX (priv->level_filter), 0); - g_signal_connect (priv->level_filter, "changed", + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->level_filter), 0); + g_signal_connect (self->priv->level_filter, "changed", G_CALLBACK (debug_window_filter_changed_cb), object); + /* Info bar */ + infobar = gtk_info_bar_new (); + gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_INFO); + + label = gtk_label_new ( + _("Even if they don't display passwords, logs can contain sensitive " + "information such as your list of contacts or the messages you " + "recently sent or received.\nIf you don't want to see such " + "information available in a public bug report, you " + "can choose to limit the visibility of your bug to " + "Empathy developers when reporting it by displaying " + "the advanced fields in the " + "" + "bug report.")); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_style_context_add_class (gtk_widget_get_style_context (label), + GTK_STYLE_CLASS_DIM_LABEL); + + content = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar)); + gtk_box_pack_start (GTK_BOX (content), label, FALSE, FALSE, 0); + + gtk_widget_show (infobar); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (vbox), infobar, FALSE, FALSE, 0); + /* Debug treeview */ - priv->view = gtk_tree_view_new (); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (priv->view), TRUE); + self->priv->view = gtk_tree_view_new (); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (self->priv->view), TRUE); - g_signal_connect (priv->view, "button-press-event", + g_signal_connect (self->priv->view, "button-press-event", G_CALLBACK (debug_window_button_press_event_cb), object); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "yalign", 0, NULL); + g_object_set (renderer, "yalign", (gfloat) 0, NULL); - gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (priv->view), + gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), -1, _("Time"), renderer, (GtkTreeCellDataFunc) debug_window_time_formatter, NULL, NULL); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view), - -1, _("Domain"), renderer, "text", COL_DEBUG_DOMAIN, NULL); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view), - -1, _("Category"), renderer, "text", COL_DEBUG_CATEGORY, NULL); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view), - -1, _("Level"), renderer, "text", COL_DEBUG_LEVEL_STRING, NULL); + gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), + -1, _("Domain"), renderer, + (GtkTreeCellDataFunc) debug_window_domain_formatter, NULL, NULL); + gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), + -1, _("Category"), renderer, + (GtkTreeCellDataFunc) debug_window_category_formatter, NULL, NULL); + gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), + -1, _("Level"), renderer, + (GtkTreeCellDataFunc) debug_window_level_formatter, NULL, NULL); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "family", "Monospace", NULL); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view), - -1, _("Message"), renderer, "text", COL_DEBUG_MESSAGE, NULL); - priv->store_filter = NULL; + g_object_set (renderer, + "family", "Monospace", + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); + + gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), + -1, _("Message"), renderer, + (GtkTreeCellDataFunc) debug_window_message_formatter, NULL, NULL); - gtk_tree_view_set_model (GTK_TREE_VIEW (priv->view), priv->store_filter); + self->priv->store_filter = NULL; + + gtk_tree_view_set_model (GTK_TREE_VIEW (self->priv->view), + self->priv->store_filter); /* Scrolled window */ - priv->scrolled_win = g_object_ref (gtk_scrolled_window_new (NULL, NULL)); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_win), + self->priv->scrolled_win = g_object_ref (gtk_scrolled_window_new ( + NULL, NULL)); + gtk_scrolled_window_set_policy ( + GTK_SCROLLED_WINDOW (self->priv->scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_show (priv->view); - gtk_container_add (GTK_CONTAINER (priv->scrolled_win), priv->view); + gtk_widget_show (self->priv->view); + gtk_container_add (GTK_CONTAINER (self->priv->scrolled_win), + self->priv->view); - gtk_widget_show (priv->scrolled_win); + gtk_widget_show (self->priv->scrolled_win); /* Not supported label */ - priv->not_supported_label = g_object_ref (gtk_label_new ( + self->priv->not_supported_label = g_object_ref (gtk_label_new ( _("The selected connection manager does not support the remote " "debugging extension."))); - gtk_widget_show (priv->not_supported_label); - gtk_box_pack_start (GTK_BOX (vbox), priv->not_supported_label, + gtk_widget_show (self->priv->not_supported_label); + gtk_box_pack_start (GTK_BOX (vbox), self->priv->not_supported_label, TRUE, TRUE, 0); - priv->view_visible = FALSE; + self->priv->view_visible = FALSE; - priv->all_active_buffer = NULL; + self->priv->all_active_buffer = NULL; debug_window_set_toolbar_sensitivity (EMPATHY_DEBUG_WINDOW (object), FALSE); debug_window_fill_service_chooser (EMPATHY_DEBUG_WINDOW (object)); @@ -2120,22 +2077,17 @@ am_prepared_cb (GObject *am, static void debug_window_constructed (GObject *object) { - EmpathyDebugWindowPriv *priv = GET_PRIV (object); + EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (object); - priv->am = tp_account_manager_dup (); - tp_proxy_prepare_async (priv->am, NULL, am_prepared_cb, object); + self->priv->am = tp_account_manager_dup (); + tp_proxy_prepare_async (self->priv->am, NULL, am_prepared_cb, object); } static void -empathy_debug_window_init (EmpathyDebugWindow *empathy_debug_window) +empathy_debug_window_init (EmpathyDebugWindow *self) { - EmpathyDebugWindowPriv *priv = - G_TYPE_INSTANCE_GET_PRIVATE (empathy_debug_window, + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindowPriv); - - empathy_debug_window->priv = priv; - - priv->dispose_run = FALSE; } static void @@ -2169,9 +2121,9 @@ debug_window_get_property (GObject *object, static void debug_window_finalize (GObject *object) { - EmpathyDebugWindowPriv *priv = GET_PRIV (object); + EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (object); - g_free (priv->select_name); + g_free (self->priv->select_name); (G_OBJECT_CLASS (empathy_debug_window_parent_class)->finalize) (object); } @@ -2179,30 +2131,16 @@ debug_window_finalize (GObject *object) static void debug_window_dispose (GObject *object) { - EmpathyDebugWindow *selector = EMPATHY_DEBUG_WINDOW (object); - EmpathyDebugWindowPriv *priv = GET_PRIV (selector); - - if (priv->dispose_run) - return; - - priv->dispose_run = TRUE; + EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (object); - if (priv->name_owner_changed_signal != NULL) - tp_proxy_signal_connection_disconnect (priv->name_owner_changed_signal); + if (self->priv->name_owner_changed_signal != NULL) + tp_proxy_signal_connection_disconnect ( + self->priv->name_owner_changed_signal); - if (priv->service_store != NULL) - g_object_unref (priv->service_store); - - if (priv->dbus != NULL) - g_object_unref (priv->dbus); - - if (priv->am != NULL) - { - g_object_unref (priv->am); - priv->am = NULL; - } - - tp_clear_object (&priv->all_active_buffer); + g_clear_object (&self->priv->service_store); + g_clear_object (&self->priv->dbus); + g_clear_object (&self->priv->am); + g_clear_object (&self->priv->all_active_buffer); (G_OBJECT_CLASS (empathy_debug_window_parent_class)->dispose) (object); } @@ -2216,6 +2154,7 @@ empathy_debug_window_class_init (EmpathyDebugWindowClass *klass) object_class->finalize = debug_window_finalize; object_class->set_property = debug_window_set_property; object_class->get_property = debug_window_get_property; + g_type_class_add_private (klass, sizeof (EmpathyDebugWindowPriv)); } @@ -2234,15 +2173,13 @@ void empathy_debug_window_show (EmpathyDebugWindow *self, const gchar *name) { - EmpathyDebugWindowPriv *priv = GET_PRIV (self); - - if (priv->service_store != NULL) + if (self->priv->service_store != NULL) { empathy_debug_window_select_name (self, name); } else { - g_free (priv->select_name); - priv->select_name = g_strdup (name); + g_free (self->priv->select_name); + self->priv->select_name = g_strdup (name); } }