[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-115-g193e2d4)
The branch, master has been updated
via 193e2d4b748bc88d504abfa5b3cfba2382193d02 (commit)
via d64878d06d87592e3fa4a0a478eacff5ea105253 (commit)
via e97af7cb9cd0b79534cc2bf93e6e5dbf336e883a (commit)
from ae225157603f063747709fa3d639ed8cdf63f6b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/scripts/gschemdoc.sh | 4 ++--
libgeda/src/g_basic.c | 3 ---
libgeda/src/g_register.c | 3 ---
libgeda/src/g_smob.c | 2 +-
libgeda/src/o_selection.c | 3 ---
libgeda/src/o_text_basic.c | 3 +--
libgeda/src/s_basic.c | 7 ++-----
libgeda/src/s_conn.c | 3 ---
libgeda/src/s_cue.c | 3 ---
libgeda/src/s_hierarchy.c | 3 ---
libgeda/src/s_log.c | 3 ---
libgeda/src/s_page.c | 3 ---
libgeda/src/s_stretch.c | 3 ---
libgeda/src/s_tile.c | 17 +++++++----------
libgeda/src/s_undo.c | 3 ---
15 files changed, 13 insertions(+), 50 deletions(-)
=================
Commit Messages
=================
commit 193e2d4b748bc88d504abfa5b3cfba2382193d02
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Wed Nov 28 16:27:08 2007 +0000
libgeda: Don't use assert.h (use Glib's g_assert instead)
:100644 100644 13f96dd... 2af1a3d... M libgeda/src/g_basic.c
:100644 100644 52d0622... 795f061... M libgeda/src/g_register.c
:100644 100644 6be87d3... a7ce5e3... M libgeda/src/o_selection.c
:100644 100644 16cf56a... 77a33db... M libgeda/src/o_text_basic.c
:100644 100644 72cfe87... 8ee6385... M libgeda/src/s_basic.c
:100644 100644 ca9a1c1... 9ebd32b... M libgeda/src/s_conn.c
:100644 100644 d0341cf... 45f1ee6... M libgeda/src/s_cue.c
:100644 100644 c2f8363... 49d4e84... M libgeda/src/s_hierarchy.c
:100644 100644 a4746ad... 45c5b1d... M libgeda/src/s_log.c
:100644 100644 6506685... bf22f76... M libgeda/src/s_page.c
:100644 100644 2e781ac... ef0d25c... M libgeda/src/s_stretch.c
:100644 100644 6fa373f... 2ab714d... M libgeda/src/s_tile.c
:100644 100644 f8447e3... 4238afd... M libgeda/src/s_undo.c
commit d64878d06d87592e3fa4a0a478eacff5ea105253
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Wed Nov 28 16:27:05 2007 +0000
libgeda: Correct func name in SCM_ASSERT call
:100644 100644 12afb4b... 24f4fc3... M libgeda/src/g_smob.c
commit e97af7cb9cd0b79534cc2bf93e6e5dbf336e883a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Wed Nov 28 14:58:15 2007 +0000
gschemdoc: Use xdg-open if available
xdg-open is a tool from freedesktop.org which tries to use the user's
preferred application to open a file or URL. This is a big
improvement over using a hardcoded list of applications to try.
:100644 100644 acae51c... 7077e82... M gschem/scripts/gschemdoc.sh
=========
Changes
=========
commit 193e2d4b748bc88d504abfa5b3cfba2382193d02
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Wed Nov 28 16:27:08 2007 +0000
libgeda: Don't use assert.h (use Glib's g_assert instead)
diff --git a/libgeda/src/g_basic.c b/libgeda/src/g_basic.c
index 13f96dd..2af1a3d 100644
--- a/libgeda/src/g_basic.c
+++ b/libgeda/src/g_basic.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/libgeda/src/g_register.c b/libgeda/src/g_register.c
index 52d0622..795f061 100644
--- a/libgeda/src/g_register.c
+++ b/libgeda/src/g_register.c
@@ -25,9 +25,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/libgeda/src/o_selection.c b/libgeda/src/o_selection.c
index 6be87d3..a7ce5e3 100644
--- a/libgeda/src/o_selection.c
+++ b/libgeda/src/o_selection.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifndef HAVE_VSNPRINTF
#include <stdarg.h>
#endif
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 16cf56a..77a33db 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <math.h>
#include <sys/stat.h>
-#include <assert.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -1123,7 +1122,7 @@ OBJECT *o_text_read(TOPLEVEL *toplevel, OBJECT *object_list,
color = WHITE;
}
- assert(num_lines && num_lines > 0);
+ g_assert(num_lines && num_lines > 0);
textstr = g_string_new ("");
for (i = 0; i < num_lines; i++) {
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index 72cfe87..8ee6385 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifndef HAVE_VSNPRINTF
#include <stdarg.h>
#endif
@@ -85,7 +82,7 @@ struct st_old_colors old_colors[] = {
void error_if_called(void)
{
fprintf(stderr, "Somebody called error_if_called!\n");
- assert(0);
+ g_assert(0);
}
/*! \todo Finish function documentation!!!
@@ -97,7 +94,7 @@ void exit_if_null(void *ptr)
{
if (ptr == NULL) {
fprintf(stderr, "gEDA: Got NULL ptr!, please e-mail maintainer\n");
- assert(0);
+ g_assert(0);
exit(-1);
}
}
diff --git a/libgeda/src/s_conn.c b/libgeda/src/s_conn.c
index ca9a1c1..9ebd32b 100644
--- a/libgeda/src/s_conn.c
+++ b/libgeda/src/s_conn.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifndef HAVE_VSNPRINTF
#include <stdarg.h>
#endif
diff --git a/libgeda/src/s_cue.c b/libgeda/src/s_cue.c
index d0341cf..45f1ee6 100644
--- a/libgeda/src/s_cue.c
+++ b/libgeda/src/s_cue.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifndef HAVE_VSNPRINTF
#include <stdarg.h>
#endif
diff --git a/libgeda/src/s_hierarchy.c b/libgeda/src/s_hierarchy.c
index c2f8363..49d4e84 100644
--- a/libgeda/src/s_hierarchy.c
+++ b/libgeda/src/s_hierarchy.c
@@ -23,9 +23,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#include <gtk/gtk.h>
#include <libguile.h>
diff --git a/libgeda/src/s_log.c b/libgeda/src/s_log.c
index a4746ad..45c5b1d 100644
--- a/libgeda/src/s_log.c
+++ b/libgeda/src/s_log.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/libgeda/src/s_page.c b/libgeda/src/s_page.c
index 6506685..bf22f76 100644
--- a/libgeda/src/s_page.c
+++ b/libgeda/src/s_page.c
@@ -26,9 +26,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
diff --git a/libgeda/src/s_stretch.c b/libgeda/src/s_stretch.c
index 2e781ac..ef0d25c 100644
--- a/libgeda/src/s_stretch.c
+++ b/libgeda/src/s_stretch.c
@@ -24,9 +24,6 @@
#if HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#if HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifndef HAVE_VSNPRINTF
#include <stdarg.h>
#endif
diff --git a/libgeda/src/s_tile.c b/libgeda/src/s_tile.c
index 6fa373f..2ab714d 100644
--- a/libgeda/src/s_tile.c
+++ b/libgeda/src/s_tile.c
@@ -23,9 +23,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#include <ctype.h>
#include <math.h>
#ifndef HAVE_VSNPRINTF
@@ -174,7 +171,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT * object, int world_x1,
if (v < 0 || w < 0 || v > MAX_TILES_X-1 || w > MAX_TILES_Y-1) {
return;
}
- /* assert(v < MAX_TILES_X && w < MAX_TILES_Y && v >= 0 && w >= 0); */
+ /* g_assert(v < MAX_TILES_X && w < MAX_TILES_Y && v >= 0 && w >= 0); */
t_current = &p_current->world_tiles[v][w];
found = g_list_find(t_current->objects, object);
@@ -193,7 +190,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT * object, int world_x1,
if (v < 0 || w < 0 || v > MAX_TILES_X-1 || w > MAX_TILES_Y-1) {
return;
}
- /*assert(v < MAX_TILES_X && w < MAX_TILES_Y && v >= 0 && w >= 0);*/
+ /*g_assert(v < MAX_TILES_X && w < MAX_TILES_Y && v >= 0 && w >= 0);*/
t_current = &p_current->world_tiles[v][w];
found = g_list_find(t_current->objects, object);
@@ -212,7 +209,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT * object, int world_x1,
if (v < 0 || w < 0 || v > MAX_TILES_X-1 || w > MAX_TILES_Y-1) {
return;
}
- /*assert(v < MAX_TILES_X && w < MAX_TILES_Y && v >= 0 && w >= 0);*/
+ /*g_assert(v < MAX_TILES_X && w < MAX_TILES_Y && v >= 0 && w >= 0);*/
t_current = &p_current->world_tiles[v][w];
found = g_list_find(t_current->objects, object);
@@ -239,7 +236,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT * object, int world_x1,
if (v < 0 || w < 0 || v > MAX_TILES_X-1 || w > MAX_TILES_Y-1) {
return;
}
- /*assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
+ /*g_assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
v >= 0 && w >= 0);*/
t_current = &p_current->world_tiles[v][w];
found = g_list_find(t_current->objects, object);
@@ -258,7 +255,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT * object, int world_x1,
if (v < 0 || w < 0 || v > MAX_TILES_X-1 || w > MAX_TILES_Y-1) {
return;
}
- /* assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
+ /* g_assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
v >= 0 && w >= 0);*/
t_current = &p_current->world_tiles[v][w];
found = g_list_find(t_current->objects, object);
@@ -278,7 +275,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT * object, int world_x1,
if (v < 0 || w < 0 || v > MAX_TILES_X-1 || w > MAX_TILES_Y-1) {
return;
}
- /*assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
+ /*g_assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
v >= 0 && w >= 0);*/
t_current = &p_current->world_tiles[v][w];
found = g_list_find(t_current->objects, object);
@@ -306,7 +303,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT * object, int world_x1,
if (v < 0 || w < 0 || v > MAX_TILES_X-1 || w > MAX_TILES_Y-1) {
return;
}
- /*assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
+ /*g_assert(v < MAX_TILES_X && w < MAX_TILES_Y &&
v >= 0 && w >= 0);*/
t_current = &p_current->world_tiles[v][w];
found = g_list_find(t_current->objects, object);
diff --git a/libgeda/src/s_undo.c b/libgeda/src/s_undo.c
index f8447e3..4238afd 100644
--- a/libgeda/src/s_undo.c
+++ b/libgeda/src/s_undo.c
@@ -24,9 +24,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
commit d64878d06d87592e3fa4a0a478eacff5ea105253
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Wed Nov 28 16:27:05 2007 +0000
libgeda: Correct func name in SCM_ASSERT call
diff --git a/libgeda/src/g_smob.c b/libgeda/src/g_smob.c
index 12afb4b..24f4fc3 100644
--- a/libgeda/src/g_smob.c
+++ b/libgeda/src/g_smob.c
@@ -648,7 +648,7 @@ SCM g_get_line_width(SCM object_smob)
SCM_ASSERT ( SCM_NIMP(object_smob) &&
((long) SCM_CAR(object_smob) == object_smob_tag),
- object_smob, SCM_ARG1, "get-object-type");
+ object_smob, SCM_ARG1, "get-line-width");
object_struct = (struct st_object_smob *)SCM_CDR(object_smob);
commit e97af7cb9cd0b79534cc2bf93e6e5dbf336e883a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Wed Nov 28 14:58:15 2007 +0000
gschemdoc: Use xdg-open if available
xdg-open is a tool from freedesktop.org which tries to use the user's
preferred application to open a file or URL. This is a big
improvement over using a hardcoded list of applications to try.
diff --git a/gschem/scripts/gschemdoc.sh b/gschem/scripts/gschemdoc.sh
index acae51c..7077e82 100644
--- a/gschem/scripts/gschemdoc.sh
+++ b/gschem/scripts/gschemdoc.sh
@@ -26,8 +26,8 @@
#
# these may be changed to suit local preferences
#
-CANDIDATE_BROWSER="galeon mozilla phoenix netscape netscape-navigator opera firefox konqueror iexplore"
-CANDIDATE_PDFREADER="xpdf acroread ggv gv"
+CANDIDATE_BROWSER="xdg-open galeon mozilla phoenix netscape netscape-navigator opera firefox konqueror iexplore"
+CANDIDATE_PDFREADER="xdg-open xpdf acroread ggv gv"
CANDIDATE_LOCATE="slocate locate"
# For OS X, since Linux has 'open' with different semantics
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs