[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: libgeda.c
User: ahvezda
Date: 06/07/15 16:49:52
Modified: . libgeda.c o_attrib.c o_complex_basic.c o_picture.c
o_text_basic.c s_basic.c
Log:
Bunch of fixes related to releasing gdkpixbuf memory. Removed some residual
noweb lines and comments.
Revision Changes Path
1.2 +1 -1 eda/geda/gaf/libgeda/src/libgeda.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: libgeda.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/libgeda.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libgeda.c 5 Jul 2006 03:13:38 -0000 1.1
+++ libgeda.c 15 Jul 2006 20:49:52 -0000 1.2
@@ -58,7 +58,7 @@
if (geda_data == NULL) {
new_data = g_strdup_printf("GEDADATA=%s", GEDADATADIR);
putenv(new_data);
- /*free(new_data); putenv takes over the memory? */
+ /*free(new_data); putenv takes over the memory on some OSes, do not free */
/* We'll use this someday. . . . . */
/* g_setenv ("GEDADATA", GEDADATADIR, FALSE); */ /* requires glib-2.4.* */
1.37 +1 -2 eda/geda/gaf/libgeda/src/o_attrib.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_attrib.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_attrib.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- o_attrib.c 15 Jul 2006 17:00:51 -0000 1.36
+++ o_attrib.c 15 Jul 2006 20:49:52 -0000 1.37
@@ -919,9 +919,9 @@
if ( (*(equal_ptr + 1) == ' ') || (*(equal_ptr - 1) == ' ') ) {
/* sometimes you have text with an ='s in it, it shouldn't be */
+ /* treated like an attribute */
#if DEBUG
- /* treated like an attribute */
s_log_message("Found attrib/text with spaces beside the ='s [%s]\n",
string);
s_log_message("You can ignore the above message if the text is not intended to be an attribute\n");
@@ -1716,7 +1716,6 @@
return(NULL);
}
-#line 1849 "../noweb/o_attrib.nw"
/*! \brief Search for first occurance of a named attribute.
* \par Function Description
* Search for first occurance of a named attribute.
1.26 +5 -1 eda/geda/gaf/libgeda/src/o_complex_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_complex_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_complex_basic.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- o_complex_basic.c 15 Jul 2006 17:00:51 -0000 1.25
+++ o_complex_basic.c 15 Jul 2006 20:49:52 -0000 1.26
@@ -1612,7 +1612,11 @@
return(NULL);
}
-#line 1849 "../noweb/o_complex_basic.nw"
+/*! \brief
+ * \par Function Description
+ *
+ */
+/* pass in top level object */
void
o_complex_check_symversion(TOPLEVEL* w_current, OBJECT* object)
{
1.3 +2 -2 eda/geda/gaf/libgeda/src/o_picture.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_picture.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_picture.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- o_picture.c 15 Jul 2006 17:00:51 -0000 1.2
+++ o_picture.c 15 Jul 2006 20:49:52 -0000 1.3
@@ -345,7 +345,7 @@
}
if (w_current->current_pixbuf != NULL) {
- g_free(w_current->current_pixbuf);
+ g_object_unref(w_current->current_pixbuf);
w_current->current_pixbuf=NULL;
}
@@ -439,7 +439,7 @@
*/
/*
if (w_current->current_pixbuf != NULL) {
- g_free (w_current->current_pixbuf);
+ g_object_unref(w_current->current_pixbuf);
}
w_current->current_pixbuf = NULL;
w_current->pixbuf_wh_ratio = 0;
1.21 +0 -1 eda/geda/gaf/libgeda/src/o_text_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_text_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/o_text_basic.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- o_text_basic.c 15 Jul 2006 17:00:51 -0000 1.20
+++ o_text_basic.c 15 Jul 2006 20:49:52 -0000 1.21
@@ -45,7 +45,6 @@
#include <dmalloc.h>
#endif
-#line 117 "../noweb/o_text_basic.nw"
#define WINONLY 1
#define BACKING 2
1.23 +2 -2 eda/geda/gaf/libgeda/src/s_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: s_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/src/s_basic.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- s_basic.c 15 Jul 2006 17:00:51 -0000 1.22
+++ s_basic.c 15 Jul 2006 20:49:52 -0000 1.23
@@ -434,9 +434,9 @@
/* printf("sdeleting picture\n");*/
#ifndef HAS_GTK12
if (o_current->picture->original_picture)
- g_free(o_current->picture->original_picture);
+ g_object_unref(o_current->picture->original_picture);
if (o_current->picture->displayed_picture)
- g_free(o_current->picture->displayed_picture);
+ g_object_unref(o_current->picture->displayed_picture);
#endif
if (o_current->picture->filename)
g_free(o_current->picture->filename);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs