[seahorse-nautilus] Fix loading of UI files
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse-nautilus] Fix loading of UI files
- Date: Fri, 29 Jun 2012 07:36:22 +0000 (UTC)
commit e83548cf4f26ddac22940b0cff16f8d38b55f1a3
Author: Stef Walter <stefw gnome org>
Date: Fri Jun 29 08:42:00 2012 +0200
Fix loading of UI files
* Path was built incorrectly
* Report errors during loading of UI files
tool/Makefile.am | 2 +-
tool/seahorse-widget.c | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/tool/Makefile.am b/tool/Makefile.am
index 4047e94..77348a0 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/seahorse-nautilus/ui
+uidir = $(datadir)/seahorse-nautilus/ui/
localedir = $(datadir)/locale
INCLUDES = -I$(top_builddir) \
diff --git a/tool/seahorse-widget.c b/tool/seahorse-widget.c
index b37238b..5defcf9 100644
--- a/tool/seahorse-widget.c
+++ b/tool/seahorse-widget.c
@@ -195,6 +195,7 @@ static void
object_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
SeahorseWidget *swidget;
+ GError *error = NULL;
GtkWidget *w;
char *path;
@@ -208,7 +209,11 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam
path = g_strdup_printf ("%sseahorse-%s.xml",
SEAHORSE_UIDIR, swidget->name);
swidget->gtkbuilder = gtk_builder_new ();
- gtk_builder_add_from_file (swidget->gtkbuilder, path, NULL);
+ gtk_builder_add_from_file (swidget->gtkbuilder, path, &error);
+ if (error != NULL) {
+ g_warning ("couldn't load ui file: %s", error->message);
+ g_error_free (error);
+ }
g_free (path);
g_return_if_fail (swidget->gtkbuilder != NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]