[gob] Tue Dec 18 20:55:58 2012 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit 61215fc82b2cfacadcdd7349a56f0de395e1d619
Author: Jiri (George) Lebl <jirka 5z com>
Date:   Tue Dec 18 20:56:05 2012 -0600

    Tue Dec 18 20:55:58 2012  Jiri (George) Lebl <jirka 5z com>
    
    	* src/main.c: apply patch from Nick Bowler to not output
    	  line 0 statements for private functions that don't appear
    	  in gob file

 ChangeLog  |    6 ++++++
 src/main.c |   12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a54a974..b52dcf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 18 20:55:58 2012  Jiri (George) Lebl <jirka 5z com>
+
+	* src/main.c: apply patch from Nick Bowler to not output
+	  line 0 statements for private functions that don't appear
+	  in gob file
+
 Sun Jul 15 06:21:55 2012  Jiri (George) Lebl <jirka 5z com>
 
 	* src/main.c, src/out.c: Fix for empty file separator.  Thanks to
diff --git a/src/main.c b/src/main.c
index 921fe8e..12ea146 100644
--- a/src/main.c
+++ b/src/main.c
@@ -578,11 +578,13 @@ put_priv_method_prot(const Method *m)
 	    m->cbuf)) {
 		/* add unique ID */
 		char *s = g_strdup_printf("___%x_", (guint)m->unique_id);
-		out_addline_infile(out, m->line_no);
+		if (m->line_no > 0)
+			out_addline_infile(out, m->line_no);
 		print_method(out, "static ", s, "", " ", "",
 			     no_gnu?";\n":" G_GNUC_UNUSED;\n",
 			     m, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE);
-		out_addline_outfile(out);
+		if (m->line_no > 0)
+			out_addline_outfile(out);
 		g_free(s);
 	} else if(m->scope == PRIVATE_SCOPE ||
 		  m->method == INIT_METHOD ||
@@ -590,11 +592,13 @@ put_priv_method_prot(const Method *m)
 		  m->method == CONSTRUCTOR_METHOD ||
 		  m->method == DISPOSE_METHOD ||
 		  m->method == FINALIZE_METHOD) {
-		out_addline_infile(out, m->line_no);
+		if (m->line_no > 0)
+			out_addline_infile(out, m->line_no);
 		print_method(out, "static ", "", "", " ", "",
 			     no_gnu?";\n":" G_GNUC_UNUSED;\n",
 			     m, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE);
-		out_addline_outfile(out);
+		if (m->line_no > 0)
+			out_addline_outfile(out);
 	}
 }