[gimp] plug-ins: move the UI file to datadir/ui/plug-ins/plug-in-file-png.ui
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: move the UI file to datadir/ui/plug-ins/plug-in-file-png.ui
- Date: Tue, 12 Jan 2010 21:03:47 +0000 (UTC)
commit d2406fd4c350a13b77b87f0996bb8d91e8a22a4a
Author: Michael Natterer <mitch gimp org>
Date: Tue Jan 12 22:02:51 2010 +0100
plug-ins: move the UI file to datadir/ui/plug-ins/plug-in-file-png.ui
plug-ins/Makefile.am | 2 +-
plug-ins/common/file-png.c | 5 ++++-
plug-ins/ui/Makefile.am | 4 ++--
plug-ins/ui/{file-png.ui => plug-in-file-png.ui} | 0
4 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 6fa923a..245f87e 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -69,7 +69,6 @@ SUBDIRS = \
flame \
fractal-explorer \
gfig \
- ui \
gimpressionist \
gradient-flare \
help \
@@ -84,5 +83,6 @@ SUBDIRS = \
$(print) \
selection-to-path \
$(twain) \
+ ui \
$(win_snap) \
common
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index 47a803e..e906951 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -1808,7 +1808,7 @@ save_dialog (gint32 image_ID,
/* GtkBuilder init */
builder = gtk_builder_new ();
ui_file = g_build_filename (gimp_data_directory (),
- "ui/file-png.ui",
+ "ui/plug-ins/plug-in-file-png.ui",
NULL);
if (! gtk_builder_add_from_file (builder, ui_file, &error))
{
@@ -1884,8 +1884,11 @@ save_dialog (gint32 image_ID,
/* Show dialog and run */
gtk_widget_show (dialog);
+
pg.run = FALSE;
+
gtk_main ();
+
return pg.run;
}
diff --git a/plug-ins/ui/Makefile.am b/plug-ins/ui/Makefile.am
index 62412f0..6e30b58 100644
--- a/plug-ins/ui/Makefile.am
+++ b/plug-ins/ui/Makefile.am
@@ -1,6 +1,6 @@
-uidatadir = $(gimpdatadir)/ui
+uidatadir = $(gimpdatadir)/ui/plug-ins
uidata_DATA = \
- file-png.ui
+ plug-in-file-png.ui
EXTRA_DIST = $(uidata_DATA)
diff --git a/plug-ins/ui/file-png.ui b/plug-ins/ui/plug-in-file-png.ui
similarity index 100%
rename from plug-ins/ui/file-png.ui
rename to plug-ins/ui/plug-in-file-png.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]