[goffice] UI: handle data: resources as documented.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] UI: handle data: resources as documented.
- Date: Mon, 29 Dec 2014 00:04:04 +0000 (UTC)
commit e279342b2725726ae3e5244486e5962de8e1c944
Author: Morten Welinder <terra gnome org>
Date: Sun Dec 28 19:03:29 2014 -0500
UI: handle data: resources as documented.
ChangeLog | 3 +++
goffice/gtk/goffice-gtk.c | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b545d0..a133153 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-12-28 Morten Welinder <terra gnome org>
+ * goffice/gtk/goffice-gtk.c (go_gtk_builder_load_internal):
+ Actually handle the claimed data: prefix.
+
* goffice/gtk/go-color-palette.c: Avoid GtkColorSelDialog which is
_gone_ from current gtk+. Use GtkColorChooserWidget instead.
* goffice/gtk/go-color-selector.c: Ditto.
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index da84826..c42b815 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -139,7 +139,7 @@ apply_ui_from_file (GtkBuilder *gui, GsfInput *src, const char *uifile,
/*
* This is sad, but see bugs 662503 and 662679. Since
* ui files can contain relative filenames we must use
- * the _file interface to load such files. Do no
+ * the _file interface to load such files. Do not
* compress such files for the time being.
*/
res = gtk_builder_add_from_file (gui, uifile, error);
@@ -274,12 +274,14 @@ go_gtk_builder_new (char const *uifile,
**/
GtkBuilder *
go_gtk_builder_load_internal (char const *uifile,
- char const *domain, GOCmdContext *gcc)
+ char const *domain, GOCmdContext *gcc)
{
char *f;
GtkBuilder *res;
- if (g_path_is_absolute (uifile) || strncmp (uifile, "res:", 4) == 0)
+ if (g_path_is_absolute (uifile) ||
+ strncmp (uifile, "res:", 4) == 0 ||
+ strncmp (uifile, "data:", 5) == 0)
return go_gtk_builder_load (uifile, domain, gcc);
f = g_build_filename (go_sys_data_dir (), "ui", uifile, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]