Commit 0c812fe2 authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

do not compile glade-helper, we don't need glade thus kill the libglade


Fri Feb 13 13:08:55 2009  Jiri (George) Lebl <jirka@5z.com>

	* configure.in, ve/Makefile.am: do not compile glade-helper,
	  we don't need glade thus kill the libglade dep

	* configure.in: require GTK 2.6.0 (yeah way behind times)

	* src/gnome-genius.c: exorcise some libgnome/ui demons.  get rid of
	  gnome_help_* and gnome_config_* and gnome_about*  One more step
	  towards getting rid of this dep

	* src/genius.c, src/gnome-genius.c: when binreloc gets us the wrong
	  dir do not use it.  Use the default compiled in dir as backup.


svn path=/trunk/; revision=712
parent bc436a46
Fri Feb 13 13:08:55 2009 Jiri (George) Lebl <jirka@5z.com>
* configure.in, ve/Makefile.am: do not compile glade-helper,
we don't need glade thus kill the libglade dep
* configure.in: require GTK 2.6.0 (yeah way behind times)
* src/gnome-genius.c: exorcise some libgnome/ui demons. get rid of
gnome_help_* and gnome_config_* and gnome_about* One more step
towards getting rid of this dep
* src/genius.c, src/gnome-genius.c: when binreloc gets us the wrong
dir do not use it. Use the default compiled in dir as backup.
Tue Feb 10 16:43:08 2009 Jiri (George) Lebl <jirka@5z.com> Tue Feb 10 16:43:08 2009 Jiri (George) Lebl <jirka@5z.com>
* configure.in, NEWS: raise version update NEWS * configure.in, NEWS: raise version update NEWS
......
...@@ -4,6 +4,7 @@ Changes to 1.0.5 ...@@ -4,6 +4,7 @@ Changes to 1.0.5
* Fix EulersMethod (and also fix it's documentation) * Fix EulersMethod (and also fix it's documentation)
* EulersMethod and RungeKutta now solve systems by accepting vectors * EulersMethod and RungeKutta now solve systems by accepting vectors
* Fix several memory leaks * Fix several memory leaks
* Translation update (Jorge Gonzalez, Javier F. Serrador)
Changes to 1.0.4 Changes to 1.0.4
......
...@@ -14,9 +14,8 @@ dnl ================= Requirements ============================================= ...@@ -14,9 +14,8 @@ dnl ================= Requirements =============================================
VTE_REQUIRED=0.8.19 VTE_REQUIRED=0.8.19
LIBGNOMEUI_REQUIRED=2.0.0 LIBGNOMEUI_REQUIRED=2.0.0
LIBGLADE_REQUIRED=1.99.2
LIBGNOME_REQUIRED=2.0.0 LIBGNOME_REQUIRED=2.0.0
GTK_REQUIRED=2.4.0 GTK_REQUIRED=2.6.0
GLIB_REQUIRED=2.0.0 GLIB_REQUIRED=2.0.0
GTKSOURCEVIEW_REQUIRED=0.3.0 GTKSOURCEVIEW_REQUIRED=0.3.0
GTKSOURCEVIEW2_REQUIRED=2.0.2 GTKSOURCEVIEW2_REQUIRED=2.0.2
...@@ -119,7 +118,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) ...@@ -119,7 +118,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)
GENIUS_MODULES="gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED vte >= $VTE_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" GENIUS_MODULES="gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED vte >= $VTE_REQUIRED"
if test "x$use_gnome" = "xyes" ; then if test "x$use_gnome" = "xyes" ; then
echo " echo "
...@@ -148,7 +147,7 @@ Note: ...@@ -148,7 +147,7 @@ Note:
PKG_CHECK_MODULES(GENIUS, $GENIUS_MODULES) PKG_CHECK_MODULES(GENIUS, $GENIUS_MODULES)
fi fi
VICIOUS_MODULES="gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" VICIOUS_MODULES="gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED"
VICIOUS_UI_LIBS="libviciousui.a" VICIOUS_UI_LIBS="libviciousui.a"
GTKEXTRA_LIBS="libgtkextra-genius.a" GTKEXTRA_LIBS="libgtkextra-genius.a"
......
/* GENIUS Calculator /* GENIUS Calculator
* Copyright (C) 1997-2008 Jiri (George) Lebl * Copyright (C) 1997-2009 Jiri (George) Lebl
* *
* Author: Jiri (George) Lebl * Author: Jiri (George) Lebl
* *
...@@ -147,9 +147,13 @@ gel_call_help (const char *function) ...@@ -147,9 +147,13 @@ gel_call_help (const char *function)
g_free (str); g_free (str);
if G_UNLIKELY (access (file, R_OK) != 0) { if G_UNLIKELY (access (file, R_OK) != 0) {
puterror (_("Cannot locate the manual"));
g_free (file); g_free (file);
return; file = g_build_filename (DATADIR, "genius", "genius.txt", NULL);
if G_UNLIKELY (access (file, R_OK) != 0) {
puterror (_("Cannot locate the manual"));
g_free (file);
return;
}
} }
str = g_find_program_in_path ("less"); str = g_find_program_in_path ("less");
...@@ -161,6 +165,7 @@ gel_call_help (const char *function) ...@@ -161,6 +165,7 @@ gel_call_help (const char *function)
argv[0] = str; argv[0] = str;
argv[1] = file; argv[1] = file;
argv[2] = NULL;
g_spawn_sync (NULL /* wd */, g_spawn_sync (NULL /* wd */,
argv, argv,
NULL /* envp */, NULL /* envp */,
...@@ -537,6 +542,14 @@ main(int argc, char *argv[]) ...@@ -537,6 +542,14 @@ main(int argc, char *argv[])
"gel", "gel",
"lib.cgel", "lib.cgel",
NULL); NULL);
if (access (file, F_OK) != 0) {
g_free (file);
file = g_build_filename (DATADIR,
"genius",
"gel",
"lib.cgel",
NULL);
}
gel_load_compiled_file (NULL, gel_load_compiled_file (NULL,
file, file,
FALSE); FALSE);
......
This diff is collapsed.
...@@ -2765,7 +2765,6 @@ str_format_float (char *p, ...@@ -2765,7 +2765,6 @@ str_format_float (char *p,
for(i=0;i<e-len;i++) for(i=0;i<e-len;i++)
strcat(p,"0"); strcat(p,"0");
} else if(e<len) { } else if(e<len) {
/* FIXME: is this correct? */
p = g_realloc (p, strlen(p) + 2); p = g_realloc (p, strlen(p) + 2);
if(p[0]=='-') { if(p[0]=='-') {
shiftstr(p+1+e,1); shiftstr(p+1+e,1);
......
...@@ -35,12 +35,15 @@ libvicious_a_SOURCES = \ ...@@ -35,12 +35,15 @@ libvicious_a_SOURCES = \
libviciousui_a_SOURCES = \ libviciousui_a_SOURCES = \
$(libvicious_a_SOURCES) \ $(libvicious_a_SOURCES) \
glade-helper.c \
glade-helper.h \
ve-miscui.c \ ve-miscui.c \
ve-miscui.h \ ve-miscui.h \
viciousui.h viciousui.h
# Genius does not use glade, if you want to use ve in your project
# and want to use glade-helper make sure to compile it in
# glade-helper.c \
# glade-helper.h
test_ve_config_SOURCES = \ test_ve_config_SOURCES = \
test-ve-config.c test-ve-config.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment