From 65e714e16ba15ceb9c72bfb39ca2887b0f31c787 Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Fri, 25 Apr 2008 16:04:47 +0000
Subject: [PATCH] merge gui/ and icons/ into smyrna/

---
 cmd/smyrna/main.c     | 4 ++--
 cmd/smyrna/viewport.c | 2 +-
 graphviz.spec.in      | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 3fb0a933b..f62edfc0b 100755
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -41,7 +41,7 @@ gchar *package_data_dir;
 #endif
 gchar *package_locale_dir;
 static char* smyrnaDir;
-char* smyrnaGlade;
+static char* smyrnaGlade;
 
 char*
 smyrnaPath (char* suffix)
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 #ifdef _WIN32
 	smyrnaGlade = SMYRNA_GLADE;
 #else
-	smyrnaGlade = smyrnaPath ("gui/smyrna.glade");
+	smyrnaGlade = smyrnaPath ("smyrna.glade");
 #endif
     }
     xml = glade_xml_new(smyrnaGlade, NULL, NULL);
diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index fc614bf47..b38683f29 100755
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -238,7 +238,7 @@ void init_viewport(ViewInfo * view)
 #ifdef _WIN32
     template_file = DEFAULT_ATTRIBUTES_TEMPLATE_DOT_FILE;
 #else
-    template_file = smyrnaPath ("gui/template.dot");
+    template_file = smyrnaPath ("template.dot");
 #endif
     input_file = fopen(template_file, "r");
     if (!input_file) {
diff --git a/graphviz.spec.in b/graphviz.spec.in
index 2a11594cc..22e5a9a39 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -304,8 +304,7 @@ fi
 %exclude %{_libdir}/graphviz/*fdb
 %endif
 %if 0%{?SMYRNA}
-%{_datadir}/graphviz/gui
-%{_datadir}/graphviz/icons
+%{_datadir}/graphviz/smyrna
 %{_datadir}/graphviz/examples
 %endif
 
-- 
2.40.0