SF.net SVN: geany:[4813] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Fri Apr 9 12:30:28 UTC 2010


Revision: 4813
          http://geany.svn.sourceforge.net/geany/?rev=4813&view=rev
Author:   ntrel
Date:     2010-04-09 12:30:28 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
Update status bar after using Document->Set Line Endings.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-09 12:09:16 UTC (rev 4812)
+++ trunk/ChangeLog	2010-04-09 12:30:28 UTC (rev 4813)
@@ -3,6 +3,8 @@
  * src/editor.c:
    Fix inserting snippets with an indent when using Mac CR line
    endings.
+ * src/callbacks.c:
+   Update status bar after using Document->Set Line Endings.
 
 
 2010-04-08  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2010-04-09 12:09:16 UTC (rev 4812)
+++ trunk/src/callbacks.c	2010-04-09 12:30:28 UTC (rev 4813)
@@ -803,18 +803,26 @@
 }
 
 
+static void convert_eol(gint mode)
+{
+	GeanyDocument *doc = document_get_current();
+
+	g_return_if_fail(doc != NULL);
+
+	sci_convert_eols(doc->editor->sci, mode);
+	sci_set_eol_mode(doc->editor->sci, mode);
+	ui_update_statusbar(doc, -1);
+}
+
+
 void
 on_crlf_activate                       (GtkCheckMenuItem *menuitem,
                                         gpointer          user_data)
 {
-	GeanyDocument *doc;
 	if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem))
 		return;
-	doc = document_get_current();
-	g_return_if_fail(doc != NULL);
 
-	sci_convert_eols(doc->editor->sci, SC_EOL_CRLF);
-	sci_set_eol_mode(doc->editor->sci, SC_EOL_CRLF);
+	convert_eol(SC_EOL_CRLF);
 }
 
 
@@ -822,14 +830,10 @@
 on_lf_activate                         (GtkCheckMenuItem *menuitem,
                                         gpointer          user_data)
 {
-	GeanyDocument *doc;
 	if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem))
 		return;
-	doc = document_get_current();
-	g_return_if_fail(doc != NULL);
 
-	sci_convert_eols(doc->editor->sci, SC_EOL_LF);
-	sci_set_eol_mode(doc->editor->sci, SC_EOL_LF);
+	convert_eol(SC_EOL_LF);
 }
 
 
@@ -837,14 +841,10 @@
 on_cr_activate                         (GtkCheckMenuItem *menuitem,
                                         gpointer          user_data)
 {
-	GeanyDocument *doc;
 	if (ignore_callback || ! gtk_check_menu_item_get_active(menuitem))
 		return;
-	doc = document_get_current();
-	g_return_if_fail(doc != NULL);
 
-	sci_convert_eols(doc->editor->sci, SC_EOL_CR);
-	sci_set_eol_mode(doc->editor->sci, SC_EOL_CR);
+	convert_eol(SC_EOL_CR);
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list