merge gui/ and icons/ into smyrna/

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index 688c8f15acd54e395beac002d839ea2c1a9df86e..8b6793323791d6a9a63f59c0a28920373ee7e16a 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -1,8 +1,5 @@
-guidir = $(pkgdatadir)/gui
-icondir = $(pkgdatadir)/icons
-
 AM_CPPFLAGS = \
-       -DSMYRNA_PATH=\""$(pkgdatadir)"\" \
+       -DSMYRNA_PATH=\""$(pkgdatadir)/smyrna"\" \
         -I$(top_srcdir) \
         -I$(top_srcdir)/lib/cgraph \
         -I$(top_srcdir)/lib/cdt \

diff --git a/cmd/smyrna/gltemplate.c b/cmd/smyrna/gltemplate.c
index f7aeb309eb714628b8b5d2e4a724c1f5025e710d..75138d669493bee19304d283ad65b0c604a12730 100755 (executable)
--- a/cmd/smyrna/gltemplate.c
+++ b/cmd/smyrna/gltemplate.c
@@ -129,15 +129,14 @@ static void realize(GtkWidget * widget, gpointer data)
     GLfloat lmodel_ambient[] = { 0.2f, 0.2f, 0.2f, 1.0f };
     GLfloat local_view[] = { 0.0 };
 
-    char *smyrna_font;
+    static char *smyrna_font;
 
 #ifdef WIN32
     smyrna_font = "c:/arial.tga"
 #else
-    smyrna_font = smyrnaPath("gui/arial.tga");
+    smyrna_font = smyrnaPath("arial.tga");
 #endif
     g_print("loading font....%i\n", fontLoad(smyrna_font));
-    free(smyrna_font);
 
   /*** OpenGL BEGIN ***/
     if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))

diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index 1eee036e4ca738bb063839f46a020cb646243c65..51203bf9fe65791898a49561767d3a24a83f0e5b 100755 (executable)
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -971,12 +971,12 @@ glCompSet *glcreate_gl_topview_menu()
        smyrna_icon_fisheye = "c:/fisheye.raw"
        smyrna_icon_rotate = "c:/rotate.raw"
 #else
-       smyrna_icon_pan = smyrnaPath("icons/pan.raw");
-       smyrna_icon_zoom = smyrnaPath("icons/zoom.raw");
-       smyrna_icon_zoomplus = smyrnaPath("icons/zoomplus.raw");
-       smyrna_icon_zoomminus = smyrnaPath("icons/zoomminus.raw");
-       smyrna_icon_fisheye = smyrnaPath("icons/fisheye.raw");
-       smyrna_icon_rotate = smyrnaPath("icons/rotate.raw");
+       smyrna_icon_pan = smyrnaPath("pan.raw");
+       smyrna_icon_zoom = smyrnaPath("zoom.raw");
+       smyrna_icon_zoomplus = smyrnaPath("zoomplus.raw");
+       smyrna_icon_zoomminus = smyrnaPath("zoomminus.raw");
+       smyrna_icon_fisheye = smyrnaPath("fisheye.raw");
+       smyrna_icon_rotate = smyrnaPath("rotate.raw");
 #endif
     }