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

[glabels] / glabels2 / src / label-image.h

diff --git a/glabels2/src/label-image.h b/glabels2/src/label-image.h
index 31a480a677e8d38852e2debec3a0f64f4d159454..15216c37be74e94de697f706fa9bbb36286d5ec8 100644 (file)
--- a/glabels2/src/label-image.h
+++ b/glabels2/src/label-image.h
@@ -1,32 +1,30 @@
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
+ *  label-image.h
+ *  Copyright (C) 2001-2009  Jim Evins <evins@snaught.com>.
  *
- *  label_image.h:  GLabels label image object
+ *  This file is part of gLabels.
  *
- *  Copyright (C) 2001-2002  Jim Evins <evins@snaught.com>.
- *
- *  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/>.
  */
 
 #ifndef __LABEL_IMAGE_H__
 #define __LABEL_IMAGE_H__
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "label-object.h"
 #include "text-node.h"
 #include "merge.h"
-#include "gdk-pixbuf/gdk-pixbuf.h"
 
 G_BEGIN_DECLS
 
@@ -45,7 +43,7 @@ typedef struct _glLabelImagePrivate   glLabelImagePrivate;
 struct _glLabelImage {
        glLabelObject         object;
 
-       glLabelImagePrivate  *private;
+       glLabelImagePrivate  *priv;
 };
 
 struct _glLabelImageClass {
@@ -67,3 +65,15 @@ const GdkPixbuf *gl_label_image_get_pixbuf   (glLabelImage  *limage,
 G_END_DECLS
 
 #endif /* __LABEL_IMAGE_H__ */
+
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */