Make the "Other" page size a full-fledged member of the pages list.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@337 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/paper.c b/glabels2/src/paper.c
index f56c90c5c8ad1ef536b58ae63cb53da0b87a086f..7f0f21b87ebbe723f5b424357d4c34b61e77199a 100644 (file)
--- a/glabels2/src/paper.c
+++ b/glabels2/src/paper.c
@@ -62,12 +62,18 @@ static GList *read_paper_files_from_dir (GList       *papers,
 void
 gl_paper_init (void)
 {
-       GList *page_sizes, *p;
+       glPaper *other;
 
        gl_debug (DEBUG_PAPER, "START");
 
        papers = read_papers ();
 
+       /* Create and append an "Other" entry. */
+       other = g_new0 (glPaper,1);
+       other->id   = g_strdup ("Other");
+       other->name = g_strdup (_("Other"));
+       papers = g_list_append (papers, other);
+
        gl_debug (DEBUG_PAPER, "END");
 }
 
@@ -88,8 +94,6 @@ gl_paper_get_id_list (void)
                ids = g_list_append (ids, g_strdup (paper->id));
        }
 
-       ids = g_list_append (ids, g_strdup ("Other"));
-
        gl_debug (DEBUG_PAPER, "END");
        return ids;
 }
@@ -132,8 +136,6 @@ gl_paper_get_name_list (void)
                names = g_list_append (names, g_strdup (paper->name));
        }
 
-       names = g_list_append (names, g_strdup ("Other"));
-
        gl_debug (DEBUG_PAPER, "END");
        return names;
 }