[anjuta] git: Use AnjutaColumnTextView in the Merge pane

[James Liggett <jrliggett src gnome org>]

commit 6aba3381a38abfdc8e1ec212f855e14409f62cbc
Author: James Liggett <jrliggett cox net>
Date:   Sun Feb 13 01:36:28 2011 -0800

    git: Use AnjutaColumnTextView in the Merge pane

 plugins/git/anjuta-git.ui    |   41 +++++++++++------------------------------
 plugins/git/git-merge-pane.c |   20 ++++----------------
 plugins/git/git-merge-pane.h |    1 +
 3 files changed, 16 insertions(+), 46 deletions(-)
---
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index 74be08b..7a94411 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -1884,6 +1884,7 @@
                 <property name="invisible_char">â??</property>
                 <property name="invisible_char_set">True</property>
                 <property name="secondary_icon_stock">gtk-clear</property>
+                <property name="help_text">Drop or type a revision here</property>
               </object>
             </child>
           </object>
@@ -1929,8 +1930,8 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -1945,8 +1946,8 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1961,23 +1962,16 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                  <object class="AnjutaColumnTextView" id="log_view">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <object class="GtkTextView" id="log_view">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -1985,19 +1979,6 @@
                     <property name="position">3</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="column_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Column 0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
               </object>
             </child>
           </object>
@@ -2012,8 +1993,8 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/plugins/git/git-merge-pane.c b/plugins/git/git-merge-pane.c
index 758b0c2..ae5c5ee 100644
--- a/plugins/git/git-merge-pane.c
+++ b/plugins/git/git-merge-pane.c
@@ -36,7 +36,7 @@ on_ok_button_clicked (GtkButton *button, GitMergePane *self)
 	GtkToggleButton *use_custom_log_check;
 	gchar *revision;
 	gchar *log;
-	GtkTextView *log_view;
+	AnjutaColumnTextView *log_view;
 	GitMergeCommand *merge_command;
 
 	plugin = ANJUTA_PLUGIN_GIT (anjuta_dock_pane_get_plugin (ANJUTA_DOCK_PANE (self)));
@@ -61,9 +61,9 @@ on_ok_button_clicked (GtkButton *button, GitMergePane *self)
 
 	if (gtk_toggle_button_get_active (use_custom_log_check))
 	{
-		log_view = GTK_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
-		                                                  "log_view"));
-		log = git_pane_get_log_from_text_view (log_view);
+		log_view = ANJUTA_COLUMN_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
+		                                                            "log_view"));
+		log = anjuta_column_text_view_get_text (log_view);
 
 		if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
 		                           GTK_WIDGET (log_view), log,
@@ -125,9 +125,6 @@ git_merge_pane_init (GitMergePane *self)
 	GtkWidget *ok_button;
 	GtkWidget *cancel_button;
 	GtkWidget *use_custom_log_check;
-	GtkTextView *log_text_view;
-	GtkTextBuffer *log_buffer;
-	GtkWidget *column_label;
 
 	self->priv = g_new0 (GitMergePanePriv, 1);
 	self->priv->builder = gtk_builder_new ();
@@ -146,11 +143,6 @@ git_merge_pane_init (GitMergePane *self)
 	                                                    "cancel_button"));
 	use_custom_log_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
 	                                                           "use_custom_log_check"));
-	log_text_view = GTK_TEXT_VIEW (gtk_builder_get_object (self->priv->builder,
-	                                                       "log_text_view"));
-	log_buffer = gtk_text_view_get_buffer (log_text_view);
-	column_label = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, 
-	                                                   "column_label"));
 
 	g_signal_connect (G_OBJECT (ok_button), "clicked",
 	                  G_CALLBACK (on_ok_button_clicked),
@@ -163,10 +155,6 @@ git_merge_pane_init (GitMergePane *self)
 	g_signal_connect (G_OBJECT (use_custom_log_check), "toggled",
 	                  G_CALLBACK (on_use_custom_log_check_toggled),
 	                  self);
-
-	g_signal_connect (G_OBJECT (log_buffer), "mark-set",
-	                  G_CALLBACK (git_pane_set_log_view_column_label),
-	                  column_label);
 }
 
 static void
diff --git a/plugins/git/git-merge-pane.h b/plugins/git/git-merge-pane.h
index 96f0b4d..0faeff7 100644
--- a/plugins/git/git-merge-pane.h
+++ b/plugins/git/git-merge-pane.h
@@ -21,6 +21,7 @@
 #define _GIT_MERGE_PANE_H_
 
 #include <glib-object.h>
+#include <libanjuta/anjuta-column-text-view.h>
 #include "git-pane.h"
 #include "git-merge-command.h"