[geany/geany-plugins] e783ed: overview: Fix finding the interface file for the preferences on Windows
Colomban Wendling
git-noreply at xxxxx
Sat Mar 12 23:41:00 UTC 2016
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Sat, 12 Mar 2016 23:41:00 UTC
Commit: e783edca88761bec9cf385fae9e0e19d5f570003
https://github.com/geany/geany-plugins/commit/e783edca88761bec9cf385fae9e0e19d5f570003
Log Message:
-----------
overview: Fix finding the interface file for the preferences on Windows
Modified Paths:
--------------
overview/overview/Makefile.am
overview/overview/overviewprefspanel.c
Modified: overview/overview/Makefile.am
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -20,8 +20,7 @@ overview_la_SOURCES = \
overview_la_CFLAGS = \
$(AM_CFLAGS) \
- -I$(srcdir)/.. \
- -DOVERVIEW_PREFS_UI_FILE=\""$(pkgdatadir)/overview/prefs.ui"\"
+ -I$(srcdir)/..
overview_la_LIBADD = \
$(COMMONLIBS)
Modified: overview/overview/overviewprefspanel.c
13 lines changed, 11 insertions(+), 2 deletions(-)
===================================================================
@@ -198,16 +198,25 @@ overview_prefs_panel_init (OverviewPrefsPanel *self)
GtkBuilder *builder;
GError *error = NULL;
GtkWidget *overlay_frame;
+#ifdef G_OS_WIN32
+ gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL);
+#else
+ gchar *prefix = NULL;
+#endif
+ gchar *ui_file_path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, "prefs.ui", NULL);
builder = gtk_builder_new ();
- if (! gtk_builder_add_from_file (builder, OVERVIEW_PREFS_UI_FILE, &error))
+ if (! gtk_builder_add_from_file (builder, ui_file_path, &error))
{
- g_critical ("failed to open UI file '%s': %s", OVERVIEW_PREFS_UI_FILE, error->message);
+ g_critical ("failed to open UI file '%s': %s", ui_file_path, error->message);
g_error_free (error);
g_object_unref (builder);
return;
}
+ g_free (ui_file_path);
+ g_free (prefix);
+
self->prefs_table = builder_get_widget (builder, "prefs-table");
self->width_spin = builder_get_widget (builder, "width-spin");
self->zoom_spin = builder_get_widget (builder, "zoom-spin");
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Plugins-Commits
mailing list