[gedit/wip/loader-saver: 8/13] tab: use GtkSourceEncoding
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/loader-saver: 8/13] tab: use GtkSourceEncoding
- Date: Fri, 13 Jun 2014 20:57:38 +0000 (UTC)
commit 421006e02e622dfd2c5154a3cfe60b0293802abb
Author: Sébastien Wilmet <swilmet gnome org>
Date: Thu Jun 12 00:36:12 2014 +0200
tab: use GtkSourceEncoding
gedit/gedit-tab.c | 58 ++++++++++++++++++++++++++--------------------------
gedit/gedit-tab.h | 45 +++++++++++++++++++++--------------------
2 files changed, 52 insertions(+), 51 deletions(-)
---
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 1bf2c5b..ba57a04 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -60,7 +60,7 @@ struct _GeditTabPrivate
/* tmp data for loading */
gint tmp_line_pos;
gint tmp_column_pos;
- const GeditEncoding *tmp_encoding;
+ const GtkSourceEncoding *tmp_encoding;
GTimer *timer;
@@ -589,7 +589,7 @@ io_loading_error_info_bar_response (GtkWidget *info_bar,
GeditDocument *doc;
GeditView *view;
GFile *location;
- const GeditEncoding *encoding;
+ const GtkSourceEncoding *encoding;
doc = gedit_view_frame_get_document (tab->priv->frame);
view = gedit_view_frame_get_view (tab->priv->frame);
@@ -1348,7 +1348,7 @@ recoverable_saving_error_info_bar_response (GtkWidget *info_bar,
if (response_id == GTK_RESPONSE_OK)
{
- const GeditEncoding *encoding;
+ const GtkSourceEncoding *encoding;
gchar *tmp_uri;
encoding = gedit_conversion_error_info_bar_get_encoding (
@@ -1753,11 +1753,11 @@ _gedit_tab_new (void)
/* Whether create is TRUE, creates a new empty document if location does
not refer to an existing location */
GtkWidget *
-_gedit_tab_new_from_location (GFile *location,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos,
- gboolean create)
+_gedit_tab_new_from_location (GFile *location,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos,
+ gboolean create)
{
GeditTab *tab;
@@ -1776,10 +1776,10 @@ _gedit_tab_new_from_location (GFile *location,
}
GtkWidget *
-_gedit_tab_new_from_stream (GInputStream *stream,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos)
+_gedit_tab_new_from_stream (GInputStream *stream,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos)
{
GeditTab *tab;
@@ -1902,7 +1902,7 @@ _gedit_tab_get_tooltip (GeditTab *tab)
gchar *content_description;
gchar *content_full_description;
gchar *encoding;
- const GeditEncoding *enc;
+ const GtkSourceEncoding *enc;
case GEDIT_TAB_STATE_LOADING_ERROR:
tip = g_strdup_printf (_("Error opening file %s"),
@@ -1938,7 +1938,7 @@ _gedit_tab_get_tooltip (GeditTab *tab)
if (enc == NULL)
encoding = g_strdup (_("Unicode (UTF-8)"));
else
- encoding = gedit_encoding_to_string (enc);
+ encoding = gtk_source_encoding_to_string (enc);
tip = g_markup_printf_escaped ("<b>%s</b> %s\n\n"
"<b>%s</b> %s\n"
@@ -2032,12 +2032,12 @@ gedit_tab_get_from_document (GeditDocument *doc)
}
void
-_gedit_tab_load (GeditTab *tab,
- GFile *location,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos,
- gboolean create)
+_gedit_tab_load (GeditTab *tab,
+ GFile *location,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos,
+ gboolean create)
{
GeditDocument *doc;
@@ -2065,11 +2065,11 @@ _gedit_tab_load (GeditTab *tab,
}
void
-_gedit_tab_load_stream (GeditTab *tab,
- GInputStream *stream,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos)
+_gedit_tab_load_stream (GeditTab *tab,
+ GInputStream *stream,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos)
{
GeditDocument *doc;
@@ -2244,10 +2244,10 @@ gedit_tab_auto_save (GeditTab *tab)
void
_gedit_tab_save_as (GeditTab *tab,
- GFile *location,
- const GeditEncoding *encoding,
- GeditDocumentNewlineType newline_type,
- GeditDocumentCompressionType compression_type)
+ GFile *location,
+ const GtkSourceEncoding *encoding,
+ GeditDocumentNewlineType newline_type,
+ GeditDocumentCompressionType compression_type)
{
GeditDocument *doc;
GeditDocumentSaveFlags save_flags;
diff --git a/gedit/gedit-tab.h b/gedit/gedit-tab.h
index cc6dbff..f874a95 100644
--- a/gedit/gedit-tab.h
+++ b/gedit/gedit-tab.h
@@ -21,7 +21,7 @@
#ifndef __GEDIT_TAB_H__
#define __GEDIT_TAB_H__
-#include <gtk/gtk.h>
+#include <gtksourceview/gtksource.h>
#include <gedit/gedit-view.h>
#include <gedit/gedit-document.h>
@@ -122,38 +122,39 @@ GtkWidget *_gedit_tab_new (void);
/* Whether create is TRUE, creates a new empty document if location does
not refer to an existing location */
-GtkWidget *_gedit_tab_new_from_location (GFile *location,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos,
- gboolean create);
+GtkWidget *_gedit_tab_new_from_location (GFile *location,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos,
+ gboolean create);
-GtkWidget *_gedit_tab_new_from_stream (GInputStream *stream,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos);
+GtkWidget *_gedit_tab_new_from_stream (GInputStream *stream,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos);
gchar *_gedit_tab_get_name (GeditTab *tab);
gchar *_gedit_tab_get_tooltip (GeditTab *tab);
GdkPixbuf *_gedit_tab_get_icon (GeditTab *tab);
-void _gedit_tab_load (GeditTab *tab,
- GFile *location,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos,
- gboolean create);
-void _gedit_tab_load_stream (GeditTab *tab,
- GInputStream *location,
- const GeditEncoding *encoding,
- gint line_pos,
- gint column_pos);
+void _gedit_tab_load (GeditTab *tab,
+ GFile *location,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos,
+ gboolean create);
+
+void _gedit_tab_load_stream (GeditTab *tab,
+ GInputStream *location,
+ const GtkSourceEncoding *encoding,
+ gint line_pos,
+ gint column_pos);
void _gedit_tab_revert (GeditTab *tab);
void _gedit_tab_save (GeditTab *tab);
void _gedit_tab_save_as (GeditTab *tab,
GFile *location,
- const GeditEncoding *encoding,
+ const GtkSourceEncoding *encoding,
GeditDocumentNewlineType newline_type,
GeditDocumentCompressionType compression_type);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]