[Xfce4-commits] <mousepad:master> * mousepad/mousepad-view.c: Initialize variables, so gcc is happy. * README: Add some lines. * mousepad/mousepad-window.c: Ctrl + Shift + v is the shortcut to paste in a column.

[Nick Schermer]

Updating branch refs/heads/master
         to b408c7b5f735db6c91e3381953e6c5cfca967901 (commit)
       from 924ec4cfdac8ef8ad541d643f9789836bb3bd86c (commit)

commit b408c7b5f735db6c91e3381953e6c5cfca967901
Author: Nick Schermer <nick at xfce.org>
Date:   Sun May 20 09:58:48 2007 +0000

    	* mousepad/mousepad-view.c: Initialize variables, so gcc is
    	  happy.
    	* README: Add some lines.
    	* mousepad/mousepad-window.c: Ctrl + Shift + v is the shortcut
    	  to paste in a column.
    
    (Old svn revision: 25726)

 ChangeLog                  |   10 +++++++++-
 README                     |   44 ++++++++++++++++++++++++++++++++++++++++++++
 mousepad/mousepad-view.c   |    4 ++--
 mousepad/mousepad-window.c |    2 +-
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 326ead6..51a7ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2007-05-xx	Nick Schermer <nick at xfce.org>
+2007-05-20	Nick Schermer <nick at xfce.org>
+	* mousepad/mousepad-view.c: Initialize variables, so gcc is
+	  happy.
+	* README: Add some lines.
+	* mousepad/mousepad-window.c: Ctrl + Shift + v is the shortcut
+	  to paste in a column.
+
+
+2007-05-17	Nick Schermer <nick at xfce.org>
 	* mousepad/mousepad-view.c: Cleanup the line number code.
 	  This version is a bit faster and removed a bunch of code.
 	* mousepad/mousepad-view.c: Cleanup the indentation code. You
diff --git a/README b/README
index e69de29..839b458 100644
--- a/README
+++ b/README
@@ -0,0 +1,44 @@
+What is it?
+===========
+
+Mousepad is a simple text editor for the Xfce  desktop environment.
+
+
+The Mousepad Mission
+====================
+
+Mousepad aims to be an easy-to-use and fast editor. Our target is an
+editor for quickly editing text files, not a development environment
+or an editor with a huge bunch of plugins.
+On the other hand we try to use the latest Gtk+ features available,
+which means that if Gtk adds something new in a major release that is
+useful for the editor, we will likely bump the Gtk dependency and
+integrate this new feature in Mousepad.
+
+
+Required packages
+=================
+
+Mousepad depends on the following packages:
+
+ - Gtk+ 2.10.0 or above
+ - Libxfce4util 4.4.0 or above
+
+The following packages are optional:
+
+ - D-BUS 0.34 or above (strongly suggested)
+
+
+Installation
+============
+
+The file 'INSTALL' contains generic installation
+instructions.
+
+
+How to report bugs?
+===================
+
+Bugs should be reported to the Xfce bug tracking system
+(http://bugzilla.xfce.org, product Mousepad). You will need to create
+an account for yourself.
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index a00d8e6..9f606b0 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -876,9 +876,9 @@ mousepad_view_handle_clipboard (MousepadView *view,
                                 GtkClipboard *clipboard,
                                 gboolean      remove)
 {
-  GString       *string;
+  GString       *string = NULL;
   gint           i;
-  gint           ln, previous_ln;
+  gint           ln, previous_ln = 0;
   gchar         *slice;
   GtkTextBuffer *buffer;
   GtkTextMark   *mark_start, *mark_end;
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 76e6b1b..ef68183 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -329,7 +329,7 @@ static const GtkActionEntry action_entries[] =
     { "cut", GTK_STOCK_CUT, NULL, NULL, N_("Cut the selection"), G_CALLBACK (mousepad_window_action_cut), },
     { "copy", GTK_STOCK_COPY, NULL, NULL, N_("Copy the selection"), G_CALLBACK (mousepad_window_action_copy), },
     { "paste", GTK_STOCK_PASTE, NULL, NULL, N_("Paste the clipboard"), G_CALLBACK (mousepad_window_action_paste), },
-    { "paste-column", NULL, N_("Paste _Column"), NULL, N_("Paste the clipboard text in a clumn"), G_CALLBACK (mousepad_window_action_paste_column), },
+    { "paste-column", GTK_STOCK_PASTE, N_("Paste _Column"), "<control><shift>V", N_("Paste the clipboard text in a clumn"), G_CALLBACK (mousepad_window_action_paste_column), },
     { "delete", GTK_STOCK_DELETE, NULL, NULL, N_("Delete the selected text"), G_CALLBACK (mousepad_window_action_delete), },
     { "select-all", GTK_STOCK_SELECT_ALL, NULL, NULL, N_("Select the entire document"), G_CALLBACK (mousepad_window_action_select_all), },