aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Bradford <rob@o-hand.com>2008-04-09 15:34:28 +0000
committerrob <rob@aea7fca7-3721-49c4-ace3-ac8c44b998bb>2008-04-09 15:34:28 +0000
commit8a1cb18c63ff7dda1b9f1c5aa99382ce5a324d10 (patch)
tree8291ae8d99cdbbdaf7d3a98142c5f12c5a91cead
parent9f55aa6ec6ad58c6eebe9ce8a2301f0a75e65d46 (diff)
downloadanjuta-poky-8a1cb18c63ff7dda1b9f1c5aa99382ce5a324d10.tar.gz
anjuta-poky-8a1cb18c63ff7dda1b9f1c5aa99382ce5a324d10.tar.bz2
anjuta-poky-8a1cb18c63ff7dda1b9f1c5aa99382ce5a324d10.zip
2008-04-09 Rob Bradford <rob@openedhand.com>
* src/beaver-target.c: (_beaver_target_remote_debug), (debug_launcher_data_cb): Switch to using the same message view for all remote operations.
-rw-r--r--ChangeLog6
-rw-r--r--src/beaver-target.c21
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 808cf6c..4921851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-09 Rob Bradford <rob@openedhand.com>
+
+ * src/beaver-target.c: (_beaver_target_remote_debug),
+ (debug_launcher_data_cb):
+ Switch to using the same message view for all remote operations.
+
2008-04-07 Rob Bradford <rob@openedhand.com>
* src/plugin.c: (action_remote_debug_stop_activate_cb),
diff --git a/src/beaver-target.c b/src/beaver-target.c
index acf78c2..c341827 100644
--- a/src/beaver-target.c
+++ b/src/beaver-target.c
@@ -34,7 +34,6 @@ struct _BeaverTargetPrivate
AnjutaShell *shell;
IAnjutaMessageView *msg_view;
- IAnjutaMessageView *debug_msg_view;
AnjutaLauncher *launcher;
AnjutaLauncher *debug_launcher;
@@ -372,27 +371,27 @@ _beaver_target_remote_debug (BeaverTarget *target, gchar *cmd, gchar *cmd_args,
args = beaver_util_strv_joinv ((gchar **)ssh_options, ip_args, gdb_args, NULL);
- if (!priv->debug_msg_view)
+ if (!priv->msg_view)
{
/* Create a new view */
msg_manager = beaver_target_get_message_manager (target);
- priv->debug_msg_view = ianjuta_message_manager_add_view (msg_manager,
- _("Remote Debug"), ICON_FILE, &error);
+ priv->msg_view = ianjuta_message_manager_add_view (msg_manager,
+ _("Remote"), ICON_FILE, &error);
- if (!priv->debug_msg_view)
+ if (!priv->msg_view)
{
g_warning ("Error getting view: %s", error->message);
g_propagate_error (out_err, error);
return FALSE;
} else {
- g_signal_connect (priv->debug_msg_view, "buffer-flushed",
+ g_signal_connect (priv->msg_view, "buffer-flushed",
(GCallback)beaver_util_message_view_buffer_flushed_cb, NULL);
/* When the view is destroyed make the pointer to it null */
- g_object_add_weak_pointer (G_OBJECT (priv->debug_msg_view),
- (gpointer *)&priv->debug_msg_view);
+ g_object_add_weak_pointer (G_OBJECT (priv->msg_view),
+ (gpointer *)&priv->msg_view);
- ianjuta_message_manager_set_current_view (msg_manager, priv->debug_msg_view,
+ ianjuta_message_manager_set_current_view (msg_manager, priv->msg_view,
&error);
if (error != NULL)
@@ -468,10 +467,10 @@ debug_launcher_data_cb (AnjutaLauncher *launcher,
gchar *old_debug_output = NULL;
gchar *chars_copy = NULL;
- if (priv->debug_msg_view)
+ if (priv->msg_view)
{
/* Append to the buffer for the message view to deal with the newlines */
- ianjuta_message_view_buffer_append (priv->debug_msg_view, chars, &error);
+ ianjuta_message_view_buffer_append (priv->msg_view, chars, &error);
if (error != NULL)
{