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

[glabels] / glabels2 / src / merge-evolution.h

diff --git a/glabels2/src/merge-evolution.h b/glabels2/src/merge-evolution.h
index 32c8a9c0a96cf6386ada6b5fdf0a48fb7532d83c..f49d1b460f277b8f3a8aed531578f83166e58a85 100644 (file)
--- a/glabels2/src/merge-evolution.h
+++ b/glabels2/src/merge-evolution.h
@@ -1,26 +1,25 @@
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  merge_evolution.h:  evolution merge backend module header file
- *
- *  Copyright (C) 2002  Jim Evins <evins@snaught.com>.
+ *  merge-evolution.h
+ *  Copyright (C) 2001-2009  Jim Evins <evins@snaught.com>.
  *  and
  *  Copyright (C) 2005  Austin Henry <ahenry@users.sourceforge.net>
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  This file is part of gLabels.
+ *
+ *  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 __MERGE_EVOLUTION_H__
 #define __MERGE_EVOLUTION_H__
 
@@ -31,7 +30,7 @@ G_BEGIN_DECLS
 /* The following object arguments are available:
  *
  * name               type             description
- * --------------------------------------------------------------------------------
+ * ---------------------------------------------------------------------------
  * query              gchar*           The query used to select records
  *
  */
@@ -51,13 +50,13 @@ typedef struct _glMergeEvolutionPrivate   glMergeEvolutionPrivate;
 
 
 struct _glMergeEvolution {
-       glMerge              object;
+       glMerge                   object;
 
-       glMergeEvolutionPrivate  *private;
+       glMergeEvolutionPrivate  *priv;
 };
 
 struct _glMergeEvolutionClass {
-       glMergeClass         parent_class;
+       glMergeClass              parent_class;
 };
 
 
@@ -66,3 +65,14 @@ GType             gl_merge_evolution_get_type            (void) G_GNUC_CONST;
 G_END_DECLS
 
 #endif /* __MERGE_EVOLUTION_H__ */
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */