[Goodies-commits] r7052 - xfbib/branches/gobject/src

[Jesper Karlsson]

Author: zarper
Date: 2009-03-30 18:46:30 +0000 (Mon, 30 Mar 2009)
New Revision: 7052

Modified:
   xfbib/branches/gobject/src/xfbib-bibtex-string.c
   xfbib/branches/gobject/src/xfbib-bibtex-string.h
   xfbib/branches/gobject/src/xfbib-bibtex.c
   xfbib/branches/gobject/src/xfbib-file-io.c
Log:
Starting to implement standard bibtex strings.


Modified: xfbib/branches/gobject/src/xfbib-bibtex-string.c
===================================================================
--- xfbib/branches/gobject/src/xfbib-bibtex-string.c	2009-03-30 15:16:13 UTC (rev 7051)
+++ xfbib/branches/gobject/src/xfbib-bibtex-string.c	2009-03-30 18:46:30 UTC (rev 7052)
@@ -30,6 +30,7 @@
 {
 	GObject parent;
 	GObject *owner;
+	gint internal;
 	gchar separator;
 	gchar *variable;
 	XfbibBibtexValue *value;
@@ -58,6 +59,7 @@
 xfbib_bibtex_string_init(XfbibBibtexString *instance)
 {
 	instance->separator = '\0';
+	instance->internal = 0;
 	instance->variable = NULL;
 	instance->value = xfbib_bibtex_value_new(G_OBJECT(instance));
 }
@@ -152,3 +154,16 @@
 	g_return_val_if_fail(XFBIB_IS_BIBTEX_STRING(string), '\0');
 	return string->separator;
 }
+
+gint
+xfbib_bibtex_string_get_internal(XfbibBibtexString *string)
+{
+	g_return_val_if_fail(XFBIB_IS_BIBTEX_STRING(string), -1);
+	return string->internal;
+}
+
+void
+xfbib_bibtex_string_set_internal(XfbibBibtexString *string, gint value)
+{
+	string->internal = value;
+}

Modified: xfbib/branches/gobject/src/xfbib-bibtex-string.h
===================================================================
--- xfbib/branches/gobject/src/xfbib-bibtex-string.h	2009-03-30 15:16:13 UTC (rev 7051)
+++ xfbib/branches/gobject/src/xfbib-bibtex-string.h	2009-03-30 18:46:30 UTC (rev 7052)
@@ -50,6 +50,8 @@
 void xfbib_bibtex_string_set_value(XfbibBibtexString *, XfbibBibtexValue *);
 gboolean xfbib_bibtex_string_parse(XfbibBibtexString *, const gchar *);
 gchar xfbib_bibtex_string_get_separator(XfbibBibtexString *);
+gint xfbib_bibtex_string_get_internal(XfbibBibtexString *);
+void xfbib_bibtex_string_set_internal(XfbibBibtexString *, gint);
 
 G_END_DECLS
 

Modified: xfbib/branches/gobject/src/xfbib-bibtex.c
===================================================================
--- xfbib/branches/gobject/src/xfbib-bibtex.c	2009-03-30 15:16:13 UTC (rev 7051)
+++ xfbib/branches/gobject/src/xfbib-bibtex.c	2009-03-30 18:46:30 UTC (rev 7052)
@@ -74,8 +74,38 @@
 xfbib_bibtex_new()
 {
 	XfbibBibtex *elements;
+	XfbibBibtexString *string;
+	gchar months[12][32] = {
+			"@String{jan = \"january\"}",
+			"@String{feb = \"february\"}",
+			"@String{mar = \"march\"}",
+			"@String{apr = \"april\"}",
+			"@String{may = \"may\"}",
+			"@String{jun = \"june\"}",
+			"@String{jul = \"july\"}",
+			"@String{aug = \"august\"}",
+			"@String{sep = \"september\"}",
+			"@String{oct = \"october\"}",
+			"@String{nov = \"november\"}",
+			"@String{dec = \"december\"}"};
+	gint n;
+
 	elements = g_object_new(XFBIB_TYPE_BIBTEX, NULL);
 
+	/* Add default bibtex strings */
+	for(n = 0; n < 12; n++) {
+		string = xfbib_bibtex_string_new(G_OBJECT(elements));
+		if (xfbib_bibtex_string_parse(string, months[n])) {
+			xfbib_bibtex_string_set_internal(string, 1);
+			elements->n_strings++;
+#if G_SEQUENCE
+			g_sequence_append(elements->seq, string);
+#else
+			elements->list = g_list_append(elements->list, string);
+#endif
+		}
+	}
+
 	return elements;
 }
 

Modified: xfbib/branches/gobject/src/xfbib-file-io.c
===================================================================
--- xfbib/branches/gobject/src/xfbib-file-io.c	2009-03-30 15:16:13 UTC (rev 7051)
+++ xfbib/branches/gobject/src/xfbib-file-io.c	2009-03-30 18:46:30 UTC (rev 7052)
@@ -96,7 +96,7 @@
 	
 
 	if (!g_file_get_contents(name, &contents, &length, &err)) {
-		xfce_err("An error occured when opening the file: %s\n", err->message);
+		xfce_err(_("An error occured when opening the file: %s\n"), err->message);
 		g_error_free(err);
 		return NULL;
 	} else {
@@ -203,6 +203,7 @@
 		g_string_append_c(str, (separator == '{') ? '}' : ')');
 		g_string_append_c(str, '\n');
 	} else if (XFBIB_IS_BIBTEX_STRING(obj)) {
+				printf("printing bibtex string to file\n");
 		separator = xfbib_bibtex_string_get_separator(XFBIB_BIBTEX_STRING(obj));
 		g_string_append(str, "@string ");
 		g_string_append_c(str, separator);