[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-60-ga90588e)
The branch, master has been updated
via a90588ec6566f944756800f38f74a02f867dca87 (commit)
via d1ff81f8d8a1d18781f8cb7c4476417947a61cec (commit)
from d3b75982a9507c05cb2699ae9d875fa344608196 (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/src/i_callbacks.c | 3 --
gschem/src/o_basic.c | 2 -
gschem/src/x_preview.c | 3 --
gschem/src/x_window.c | 3 --
libgeda/include/prototype.h | 3 --
libgeda/include/struct.h | 5 ----
libgeda/src/o_attrib.c | 42 -----------------------------------------
libgeda/src/o_complex_basic.c | 23 ----------------------
libgeda/src/s_page.c | 5 ----
libgeda/src/s_toplevel.c | 5 ----
10 files changed, 0 insertions(+), 94 deletions(-)
=================
Commit Messages
=================
commit a90588ec6566f944756800f38f74a02f867dca87
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:18:39 2008 +0100
Remove the TOPLEVEL variable internal_symbol_name which is now redundant.
Also removes functions which set and free'd this variable:
o_complex_set_filename()
o_complex_free_filename().
:100644 100644 bf674fb... dadd040... M gschem/src/x_preview.c
:100644 100644 585d05c... d559499... M gschem/src/x_window.c
:100644 100644 504aeda... c6f6fc0... M libgeda/include/prototype.h
:100644 100644 8689358... 999a5a7... M libgeda/include/struct.h
:100644 100644 7ee9d69... bdc96b0... M libgeda/src/o_complex_basic.c
:100644 100644 491d0ec... da2bf22... M libgeda/src/s_page.c
:100644 100644 97f7ee2... 8c85b93... M libgeda/src/s_toplevel.c
commit d1ff81f8d8a1d18781f8cb7c4476417947a61cec
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:18:38 2008 +0100
Remove the TOPLEVEL variable current_attribute which is now redundant.
Also removes functions which set and free'd this variable:
o_attrib_set_string()
o_attrib_free_current().
:100644 100644 d0b81a2... ed02ded... M gschem/src/i_callbacks.c
:100644 100644 3adf35e... 6f8024f... M gschem/src/o_basic.c
:100644 100644 3e9efd2... bf674fb... M gschem/src/x_preview.c
:100644 100644 afafbb6... 585d05c... M gschem/src/x_window.c
:100644 100644 fa05ce9... 504aeda... M libgeda/include/prototype.h
:100644 100644 6aaf3c0... 8689358... M libgeda/include/struct.h
:100644 100644 962789c... 5ad5dcd... M libgeda/src/o_attrib.c
:100644 100644 d79c1b9... 491d0ec... M libgeda/src/s_page.c
:100644 100644 dac7bac... 97f7ee2... M libgeda/src/s_toplevel.c
=========
Changes
=========
commit a90588ec6566f944756800f38f74a02f867dca87
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:18:39 2008 +0100
Remove the TOPLEVEL variable internal_symbol_name which is now redundant.
Also removes functions which set and free'd this variable:
o_complex_set_filename()
o_complex_free_filename().
diff --git a/gschem/src/x_preview.c b/gschem/src/x_preview.c
index bf674fb..dadd040 100644
--- a/gschem/src/x_preview.c
+++ b/gschem/src/x_preview.c
@@ -485,8 +485,6 @@ preview_dispose (GObject *self)
if (preview_w_current != NULL) {
preview_w_current->drawing_area = NULL;
- o_complex_free_filename (preview_w_current->toplevel);
-
if (preview_w_current->backingstore) {
gdk_pixmap_unref (preview_w_current->backingstore);
}
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 585d05c..d559499 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -643,8 +643,6 @@ void x_window_close(GSCHEM_TOPLEVEL *w_current)
last_window = TRUE;
}
- o_complex_free_filename(toplevel);
-
if (toplevel->major_changed_refdes) {
GList* current = toplevel->major_changed_refdes;
while (current)
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 504aeda..c6f6fc0 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -195,7 +195,6 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
OBJECT *o_complex_add_embedded(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x, int y, int angle, int mirror, const gchar *basename, int selectable);
void o_complex_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_complex_set_filename(TOPLEVEL *toplevel, const char *basename);
-void o_complex_free_filename(TOPLEVEL *toplevel);
void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1, OBJECT *object);
OBJECT *o_complex_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
OBJECT *o_complex_copy_embedded(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 8689358..999a5a7 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -390,7 +390,6 @@ struct st_page {
struct st_toplevel {
- gchar *internal_symbol_name;
/* have to decided on component list stuff */
/* if it should go in here or not */
/* leave outside for now */
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 7ee9d69..bdc96b0 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -782,29 +782,6 @@ char *o_complex_save(OBJECT *object)
* \par Function Description
*
*/
-void o_complex_set_filename(TOPLEVEL *toplevel, const char *basename)
-{
- o_complex_free_filename (toplevel);
-
- toplevel->internal_symbol_name = g_strdup (basename);
-}
-
-/*! \brief
- * \par Function Description
- *
- */
-void o_complex_free_filename(TOPLEVEL *toplevel)
-{
- if (toplevel->internal_symbol_name != NULL) {
- g_free(toplevel->internal_symbol_name);
- toplevel->internal_symbol_name = NULL;
- }
-}
-
-/*! \brief
- * \par Function Description
- *
- */
void o_complex_translate_world(TOPLEVEL *toplevel, int x1, int y1,
OBJECT *object)
{
diff --git a/libgeda/src/s_page.c b/libgeda/src/s_page.c
index 491d0ec..da2bf22 100644
--- a/libgeda/src/s_page.c
+++ b/libgeda/src/s_page.c
@@ -196,10 +196,6 @@ void s_page_delete (TOPLEVEL *toplevel, PAGE *page)
g_free (page);
-#if 0 /* don't do this for now hack */ /* this is a per window free */
- o_complex_free_filename(toplevel);
-#endif
-
if (toplevel->page_current == page) {
/* page was page_current, page_current must be updated */
toplevel->page_current = NULL;
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index 97f7ee2..8c85b93 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -48,8 +48,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel = (TOPLEVEL*)g_new (TOPLEVEL, 1);
- toplevel->internal_symbol_name = NULL;
-
toplevel->RC_list = NULL;
toplevel->series_name = NULL;
@@ -174,8 +172,6 @@ void s_toplevel_delete (TOPLEVEL *toplevel)
g_source_remove (toplevel->auto_save_timeout);
}
- g_free (toplevel->internal_symbol_name);
-
g_free (toplevel->series_name);
g_free (toplevel->untitled_name);
g_free (toplevel->font_directory);
commit d1ff81f8d8a1d18781f8cb7c4476417947a61cec
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:18:38 2008 +0100
Remove the TOPLEVEL variable current_attribute which is now redundant.
Also removes functions which set and free'd this variable:
o_attrib_set_string()
o_attrib_free_current().
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index d0b81a2..ed02ded 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -3554,9 +3554,6 @@ DEFINE_I_CALLBACK(cancel)
o_redraw_all(w_current);
}
- /* also free internal current_attribute */
- o_attrib_free_current(w_current->toplevel);
-
w_current->inside_action=0;
}
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 3adf35e..6f8024f 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -537,8 +537,6 @@ int o_redraw_cleanstates(GSCHEM_TOPLEVEL *w_current)
s_delete_object_glist(toplevel, toplevel->page_current->place_list);
toplevel->page_current->place_list = NULL;
- /* also free internal current_attribute */
- o_attrib_free_current(toplevel);
w_current->inside_action = 0;
/* touch the select state */
diff --git a/gschem/src/x_preview.c b/gschem/src/x_preview.c
index 3e9efd2..bf674fb 100644
--- a/gschem/src/x_preview.c
+++ b/gschem/src/x_preview.c
@@ -485,7 +485,6 @@ preview_dispose (GObject *self)
if (preview_w_current != NULL) {
preview_w_current->drawing_area = NULL;
- o_attrib_free_current (preview_w_current->toplevel);
o_complex_free_filename (preview_w_current->toplevel);
if (preview_w_current->backingstore) {
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index afafbb6..585d05c 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -643,7 +643,6 @@ void x_window_close(GSCHEM_TOPLEVEL *w_current)
last_window = TRUE;
}
- o_attrib_free_current(toplevel);
o_complex_free_filename(toplevel);
if (toplevel->major_changed_refdes) {
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index fa05ce9..504aeda 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -107,8 +107,6 @@ void o_attrib_free_all(TOPLEVEL *toplevel, GList *list);
void o_attrib_print(GList *attributes);
void o_attrib_remove(GList **list, OBJECT *remove);
gboolean o_attrib_get_name_value (const gchar *string, gchar **name_ptr, gchar **value_ptr);
-void o_attrib_free_current(TOPLEVEL *toplevel);
-void o_attrib_set_string(TOPLEVEL *toplevel, char *string);
void o_attrib_set_color(TOPLEVEL *toplevel, GList *attributes);
char *o_attrib_search_name(OBJECT *list, char *name, int counter);
OBJECT *o_attrib_search_string_list(OBJECT *list, char *string);
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 6aaf3c0..8689358 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -390,10 +390,6 @@ struct st_page {
struct st_toplevel {
- /* used by attribute dialog */
- /* also used by text add dialog */
- char *current_attribute;
-
gchar *internal_symbol_name;
/* have to decided on component list stuff */
/* if it should go in here or not */
diff --git a/libgeda/src/o_attrib.c b/libgeda/src/o_attrib.c
index 962789c..5ad5dcd 100644
--- a/libgeda/src/o_attrib.c
+++ b/libgeda/src/o_attrib.c
@@ -619,48 +619,6 @@ o_attrib_get_name_value (const gchar *string, gchar **name_ptr, gchar **value_pt
return TRUE;
}
-/*! \brief Free the currently selected attribute.
- * \par Function Description
- * Free the currently selected attribute.
- *
- * \param [in] toplevel The TOPLEVEL object containing current attribute.
- *
- */
-void o_attrib_free_current(TOPLEVEL *toplevel)
-{
- g_free(toplevel->current_attribute);
- toplevel->current_attribute=NULL;
-}
-
-/*! \brief Set an attribute's string.
- * \par Function Description
- * Set an attribute's string.
- *
- * \param [in] toplevel The TOPLEVEL object that holds the attribute.
- * \param [in] string The value to set attribute string to.
- *
- * \note
- * The user of this function must g_free the
- * <B>toplevel->current_attribute</B> string after done using it.
- * They must also free the input string.
- */
-void o_attrib_set_string(TOPLEVEL *toplevel, char *string)
-{
- /* need to put an error messages here */
- if (string == NULL) {
- fprintf(stderr, "error! string in set_string was NULL\n");
- return;
- }
-
- if (toplevel->current_attribute != NULL) {
- g_free(toplevel->current_attribute);
- toplevel->current_attribute=NULL;
- }
-
- toplevel->current_attribute = g_strdup (string);
-
- /* be sure to g_free this string somewhere and free the input string */
-}
/*! \brief Set attribute color
* \par Function Description
diff --git a/libgeda/src/s_page.c b/libgeda/src/s_page.c
index d79c1b9..491d0ec 100644
--- a/libgeda/src/s_page.c
+++ b/libgeda/src/s_page.c
@@ -197,7 +197,6 @@ void s_page_delete (TOPLEVEL *toplevel, PAGE *page)
g_free (page);
#if 0 /* don't do this for now hack */ /* this is a per window free */
- o_attrib_free_current(toplevel);
o_complex_free_filename(toplevel);
#endif
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index dac7bac..97f7ee2 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -48,7 +48,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel = (TOPLEVEL*)g_new (TOPLEVEL, 1);
- toplevel->current_attribute = NULL;
toplevel->internal_symbol_name = NULL;
toplevel->RC_list = NULL;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs