SF.net SVN: geany: [601] trunk/src

[eht16 at users.sourceforge.net]

Revision: 601
Author:   eht16
Date:     2006-07-21 19:06:30 -0700 (Fri, 21 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=601&view=rev

Log Message:
-----------
Oops, forgot these files.

Modified Paths:
--------------
    trunk/src/callbacks.h
    trunk/src/document.h
    trunk/src/encodings.h
    trunk/src/keybindings.c
    trunk/src/utils.h
Modified: trunk/src/callbacks.h
===================================================================
--- trunk/src/callbacks.h	2006-07-22 01:29:10 UTC (rev 600)
+++ trunk/src/callbacks.h	2006-07-22 02:06:30 UTC (rev 601)
@@ -605,6 +605,10 @@
                                         gpointer         user_data);
 
 void
+on_reload_as_activate                  (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
 on_print1_activate                     (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 

Modified: trunk/src/document.h
===================================================================
--- trunk/src/document.h	2006-07-22 01:29:10 UTC (rev 600)
+++ trunk/src/document.h	2006-07-22 02:06:30 UTC (rev 601)
@@ -79,9 +79,9 @@
  * idx and set the cursor to position 0. In this case, filename should be NULL
  * It returns the idx of the opened file or -1 if an error occurred.
  */
-int document_open_file(gint, const gchar*, gint, gboolean, filetype*);
+int document_open_file(gint, const gchar*, gint, gboolean, filetype*, const gchar*);
 
-int document_reload_file(gint idx);
+int document_reload_file(gint idx, const gchar *forced_enc);
 
 
 /* This saves the file, which is in on-disk encoding (which may not

Modified: trunk/src/encodings.h
===================================================================
--- trunk/src/encodings.h	2006-07-22 01:29:10 UTC (rev 600)
+++ trunk/src/encodings.h	2006-07-22 02:06:30 UTC (rev 601)
@@ -90,10 +90,14 @@
 	GEANY_ENCODING_ISO_8859_15,
 	GEANY_ENCODING_ISO_8859_16,
 
+	GEANY_ENCODING_UTF_7,
 	GEANY_ENCODING_UTF_8,
-	GEANY_ENCODING_UTF_16,
-	GEANY_ENCODING_UCS_2,
-	GEANY_ENCODING_UCS_4,
+	GEANY_ENCODING_UTF_16LE,
+	GEANY_ENCODING_UTF_16BE,
+	GEANY_ENCODING_UCS_2LE,
+	GEANY_ENCODING_UCS_2BE,
+	GEANY_ENCODING_UTF_32LE,
+	GEANY_ENCODING_UTF_32BE,
 
 	GEANY_ENCODING_ARMSCII_8,
 	GEANY_ENCODING_BIG5,

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2006-07-22 01:29:10 UTC (rev 600)
+++ trunk/src/keybindings.c	2006-07-22 02:06:30 UTC (rev 601)
@@ -254,7 +254,7 @@
 	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_PRINT, print1);
 	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSE, menu_close1);
 	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSEALL, menu_close_all1);
-	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_RELOADFILE, revert1);
+	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_RELOADFILE, menu_reload1);
 	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_UNDO, menu_undo2);
 	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_REDO, menu_redo2);
 	GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SELECTALL, menu_select_all1);

Modified: trunk/src/utils.h
===================================================================
--- trunk/src/utils.h	2006-07-22 01:29:10 UTC (rev 600)
+++ trunk/src/utils.h	2006-07-22 02:06:30 UTC (rev 601)
@@ -222,4 +222,8 @@
  * Replaces \\, \r, \n, \t and \uXXX by their real counterparts */
 gboolean utils_str_replace_escape(gchar *string);
 
+gchar *utils_scan_unicode_bom(gchar *string);
+
+gboolean utils_is_unicode_charset(gchar *string);
+
 #endif


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