2009-09-17 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / src / util.c

diff --git a/glabels2/src/util.c b/glabels2/src/util.c
index f2f7dcfac938e87177ab5f84e17c3b7bbcec6cb2..4441f1c08e4cc944668e69e9cf824817cc5173e5 100644 (file)
--- a/glabels2/src/util.c
+++ b/glabels2/src/util.c
@@ -1,25 +1,21 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  util.c:  various small utility functions
+ *  util.c
+ *  Copyright (C) 2001-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2001  Jim Evins <evins@snaught.com>.
+ *  This file is part of gLabels.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  gLabels is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  gLabels is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -29,14 +25,13 @@
 #include <string.h>
 #include <glib.h>
 #include <math.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <libglabels/str.h>
+#include <gtk/gtk.h>
+
+#include <libglabels/libglabels.h>
 
 #define FRAC_EPSILON 0.00005
 
-\f
+
 /****************************************************************************/
 /* Append ".glabels" extension to filename if needed.                       */
 /****************************************************************************/
@@ -60,6 +55,7 @@ gl_util_add_extension (const gchar *orig_filename)
        return new_filename;
 }
 
+
 /****************************************************************************/
 /* Remove ".glabels" extension from filename if needed.                     */
 /****************************************************************************/
@@ -80,6 +76,7 @@ gl_util_remove_extension (const gchar *orig_filename)
        return new_filename;
 }
 
+
 /****************************************************************************/
 /* Make sure we have an absolute path to filename.                          */
 /****************************************************************************/
@@ -99,6 +96,7 @@ gl_util_make_absolute (const gchar *filename)
        return absolute_filename;
 }
 
+
 /****************************************************************************/
 /* Create fractional representation of number, if possible.                 */
 /****************************************************************************/
@@ -133,6 +131,7 @@ gl_util_fraction (gdouble x)
        }
 }
 
+
 /****************************************************************************/
 /* Utilities to deal with PangoAlignment types.                             */
 /****************************************************************************/
@@ -151,6 +150,7 @@ gl_util_align_to_string (PangoAlignment align)
        }
 }
 
+
 PangoAlignment
 gl_util_string_to_align (const gchar *string)
 {
@@ -167,6 +167,7 @@ gl_util_string_to_align (const gchar *string)
 
 }
 
+
 /****************************************************************************/
 /* Utilities to deal with PangoWeight types                                 */
 /****************************************************************************/
@@ -183,6 +184,7 @@ gl_util_weight_to_string (PangoWeight weight)
        }
 }
 
+
 PangoWeight
 gl_util_string_to_weight (const gchar *string)
 {
@@ -197,6 +199,7 @@ gl_util_string_to_weight (const gchar *string)
 
 }
 
+
 /****************************************************************************/
 /* Convienience function to set strings in a text combo_box from a GList    */
 /****************************************************************************/
@@ -219,6 +222,7 @@ gl_util_combo_box_set_strings (GtkComboBox       *combo,
        }
 }
 
+
 /*---------------------------------------------------------------------------*/
 /* PRIVATE.  gl_util_combo_box_set_active_text support.                      */
 /*---------------------------------------------------------------------------*/
@@ -250,6 +254,7 @@ search_text_func (GtkTreeModel *model,
   return FALSE;
 }
 
+
 /****************************************************************************/
 /* Convienience function to set active text in a text combo_box from text   */
 /****************************************************************************/
@@ -283,6 +288,7 @@ gl_util_combo_box_set_active_text (GtkComboBox       *combo,
 
 }
 
+
 /****************************************************************************/
 /* Convienience function to add a simple text model to an existing          */
 /* combo_box.  This is needed since combo_boxes created with glade do not   */
@@ -306,7 +312,6 @@ gl_util_combo_box_add_text_model (GtkComboBox       *combo)
 }
 
 
-
 /****************************************************************************/
 /* Get widgets from GtkBuilder "en masse."                                  */
 /****************************************************************************/
@@ -337,3 +342,13 @@ void gl_util_get_builder_widgets (GtkBuilder *builder,
         va_end (args);
 }
 
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */