aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-06-04 21:19:51 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-06-04 21:19:51 +0800
commitea5fbd90e9e36f1081cab4a0d2d92bc9eef25696 (patch)
tree13fa38e6d6e7a8a560dd26e2ed3d8c43b341065e /src
parent07027834acf0c40105693f079dea51687cd07141 (diff)
downloadgsoc2013-empathy-ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696.tar
gsoc2013-empathy-ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696.tar.gz
gsoc2013-empathy-ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696.tar.bz2
gsoc2013-empathy-ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696.tar.lz
gsoc2013-empathy-ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696.tar.xz
gsoc2013-empathy-ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696.tar.zst
gsoc2013-empathy-ea5fbd90e9e36f1081cab4a0d2d92bc9eef25696.zip
Clean up EmpathyDebugDialogPriv.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/empathy-debug-dialog.c29
1 files changed, 20 insertions, 9 deletions
diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c
index f5ac6367a..df62fa6b4 100644
--- a/src/empathy-debug-dialog.c
+++ b/src/empathy-debug-dialog.c
@@ -69,16 +69,27 @@ enum
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyDebugDialog)
typedef struct
{
- GtkWidget *filter;
- GtkWidget *view;
+ /* Toolbar items */
GtkWidget *cm_chooser;
+ GtkWidget *filter;
+
+ /* TreeView */
GtkListStore *store;
GtkTreeModel *store_filter;
+ GtkWidget *view;
+
+ /* Connection */
TpProxy *proxy;
- TpProxySignalConnection *signal_connection;
+ TpProxySignalConnection *new_debug_message_signal;
TpProxySignalConnection *name_owner_changed_signal;
+
+ /* Whether NewDebugMessage will be fired */
gboolean paused;
+
+ /* CM chooser store */
GtkListStore *cms;
+
+ /* Misc. */
gboolean dispose_run;
} EmpathyDebugDialogPriv;
@@ -216,7 +227,7 @@ debug_dialog_get_messages_cb (TpProxy *proxy,
}
/* Connect to NewDebugMessage */
- priv->signal_connection = emp_cli_debug_connect_to_new_debug_message (
+ priv->new_debug_message_signal = emp_cli_debug_connect_to_new_debug_message (
proxy, debug_dialog_new_debug_message_cb, debug_dialog,
NULL, NULL, NULL);
@@ -272,10 +283,10 @@ debug_dialog_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
debug_dialog_set_enabled (debug_dialog, FALSE);
/* Disconnect from previous NewDebugMessage signal */
- if (priv->signal_connection != NULL)
+ if (priv->new_debug_message_signal != NULL)
{
- tp_proxy_signal_connection_disconnect (priv->signal_connection);
- priv->signal_connection = NULL;
+ tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
+ priv->new_debug_message_signal = NULL;
}
if (priv->proxy != NULL)
@@ -1144,8 +1155,8 @@ debug_dialog_dispose (GObject *object)
g_object_unref (priv->proxy);
}
- if (priv->signal_connection != NULL)
- tp_proxy_signal_connection_disconnect (priv->signal_connection);
+ if (priv->new_debug_message_signal != NULL)
+ tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
if (priv->cms != NULL)
g_object_unref (priv->cms);