Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yad
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav
yad
Commits
e2b23f6d
Commit
e2b23f6d
authored
Aug 01, 2019
by
Victor Ananjevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix loading text from file in text-info dialog
parent
87d4f424
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
13 deletions
+6
-13
text.c
src/text.c
+6
-13
No files found.
src/text.c
View file @
e2b23f6d
...
@@ -358,7 +358,7 @@ handle_stdin (GIOChannel * channel, GIOCondition condition, gpointer data)
...
@@ -358,7 +358,7 @@ handle_stdin (GIOChannel * channel, GIOCondition condition, gpointer data)
static
void
static
void
fill_buffer_from_file
()
fill_buffer_from_file
()
{
{
GtkTextIter
iter
,
end
;
GtkTextIter
iter
;
#ifdef HAVE_SOURCEVIEW
#ifdef HAVE_SOURCEVIEW
GtkSourceLanguage
*
lang
;
GtkSourceLanguage
*
lang
;
#endif
#endif
...
@@ -385,26 +385,19 @@ fill_buffer_from_file ()
...
@@ -385,26 +385,19 @@ fill_buffer_from_file ()
gchar
*
utftext
=
gchar
*
utftext
=
g_convert_with_fallback
(
buf
,
-
1
,
"UTF-8"
,
"ISO-8859-1"
,
NULL
,
NULL
,
NULL
,
NULL
);
g_convert_with_fallback
(
buf
,
-
1
,
"UTF-8"
,
"ISO-8859-1"
,
NULL
,
NULL
,
NULL
,
NULL
);
if
(
options
.
text_data
.
formatted
&&
!
options
.
common_data
.
editable
)
if
(
options
.
text_data
.
formatted
&&
!
options
.
common_data
.
editable
)
gtk_text_buffer_insert_markup
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
end
,
utftext
,
-
1
);
gtk_text_buffer_insert_markup
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
iter
,
utftext
,
-
1
);
else
else
gtk_text_buffer_insert
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
end
,
utftext
,
-
1
);
gtk_text_buffer_insert
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
iter
,
utftext
,
-
1
);
g_free
(
utftext
);
g_free
(
utftext
);
}
}
else
else
{
{
if
(
options
.
text_data
.
formatted
&&
!
options
.
common_data
.
editable
)
if
(
options
.
text_data
.
formatted
&&
!
options
.
common_data
.
editable
)
gtk_text_buffer_insert_markup
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
end
,
buf
,
-
1
);
gtk_text_buffer_insert_markup
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
iter
,
buf
,
-
1
);
else
else
gtk_text_buffer_insert
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
end
,
buf
,
-
1
);
gtk_text_buffer_insert
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
iter
,
buf
,
-
1
);
}
}
g_free
(
buf
);
/* We had a newline in the buffer to begin with. (The buffer always contains
* a newline, so we delete to the end of the buffer to clean up.
*/
gtk_text_buffer_get_end_iter
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
end
);
gtk_text_buffer_delete
(
GTK_TEXT_BUFFER
(
text_buffer
),
&
iter
,
&
end
);
gtk_text_buffer_set_modified
(
GTK_TEXT_BUFFER
(
text_buffer
),
FALSE
);
#ifdef HAVE_SOURCEVIEW
#ifdef HAVE_SOURCEVIEW
if
(
options
.
source_data
.
lang
)
if
(
options
.
source_data
.
lang
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment