Changeset 501 for trunk

Show
Ignore:
Timestamp:
11/30/2009 02:49:34 PM (2 years ago)
Author:
powell
Message:

Proper glade directory path to search

Location:
trunk/matml/src/ternary
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/matml/src/ternary/Makefile.am

    r499 r501  
    3939 
    4040Ternary_SOURCES = Ternary.c 
    41 Ternary_CFLAGS  = $(GNOMEUI_CFLAGS) -DVERSION="\"@VERSION@\""\ #-DDEBUG 
     41Ternary_CFLAGS  = $(GNOMEUI_CFLAGS) -DVERSION=\"@VERSION@\"\ 
     42                  -DGLADE_DIRECTORY=\"$(pkgdatadir)\" #-DDEBUG 
    4243Ternary_LDADD   = libgibbs.la libfreenergy.la $(GNOMEUI_LIBS) 
    4344Ternary_LDFLAGS = -rdynamic 
    … …  
    4546EXTRA_DIST = autogen.sh macros/autogen.sh macros/cxref-latex.m4 \ 
    4647             images/freenergy-0.1.0.png images/freenergy-0.2.0.png \ 
    47              images/freenergy-0.3.0.png images/freenergy-0.3.0.png ternary.bib 
     48             images/freenergy-0.3.0.png images/freenergy-0.4.0.png \ 
     49             images/freenergy-0.5.0.png ternary.bib 
     50desktopdir   = $(datadir)/applications 
     51dist_desktop_DATA = Ternary.desktop 
     52dist_pkgdata_DATA = Ternary.glade images/icon.png 
    4853 
    4954# Everything from here down is documentation stuff. 

  • trunk/matml/src/ternary/Ternary.c

    r497 r501  
    305305{ 
    306306  int i; 
     307  char filename [200]; 
    307308 
    308309  // Initialize the program, and load and connect the Glade XML interface 
    309310  gnome_program_init ("Ternary", VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL); 
    310   xml = glade_xml_new ("Ternary.glade", NULL, NULL); 
     311  strncpy (filename, GLADE_DIRECTORY, 186); 
     312  strcat (filename, "/Ternary.glade"); 
     313  printf ("Loading Glade XML user interface file %s\n", filename); 
     314  xml = glade_xml_new (filename, NULL, NULL); 
    311315  glade_xml_signal_autoconnect (xml); 
    312316  // Fill the entry_widgets and hscale_widgets tables