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

[glabels] / glabels2 / src / wdgt-merge-menu.c

diff --git a/glabels2/src/wdgt-merge-menu.c b/glabels2/src/wdgt-merge-menu.c
index bb864c39ca5b97cf3ebd2ec9b47b94758c8e8c0b..9f0d132ee7003fc06e25d64c284dcf9a1bc501ae 100644 (file)
--- a/glabels2/src/wdgt-merge-menu.c
+++ b/glabels2/src/wdgt-merge-menu.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
- *
- *  wdgt_merge_menu.c:  merge menu widget module
+ *  wdgt-merge-menu.c
+ *  Copyright (C) 2008-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2008  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>
@@ -27,12 +23,13 @@
 #include "wdgt-merge-menu.h"
 
 #include <string.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include "marshal.h"
 
 #include "debug.h"
 
+
 /*===========================================*/
 /* Private types                             */
 /*===========================================*/
@@ -50,12 +47,14 @@ enum {
 
 typedef void (*glWdgtMergeMenuSignal) (GObject * object, gpointer data);
 
+
 /*===========================================*/
 /* Private globals                           */
 /*===========================================*/
 
 static gint signals[LAST_SIGNAL] = { 0 };
 
+
 /*===========================================*/
 /* Local function prototypes                 */
 /*===========================================*/
@@ -63,7 +62,6 @@ static gint signals[LAST_SIGNAL] = { 0 };
 static void gl_wdgt_merge_menu_finalize      (GObject              *object);
 
 
-\f
 /****************************************************************************/
 /* Boilerplate Object stuff.                                                */
 /****************************************************************************/
@@ -93,6 +91,7 @@ gl_wdgt_merge_menu_class_init (glWdgtMergeMenuClass *class)
         gl_debug (DEBUG_MERGE_MENU, "END");
 }
 
+
 static void
 gl_wdgt_merge_menu_init (glWdgtMergeMenu *merge_menu)
 {
@@ -103,6 +102,7 @@ gl_wdgt_merge_menu_init (glWdgtMergeMenu *merge_menu)
         gl_debug (DEBUG_MERGE_MENU, "END");
 }
 
+
 static void
 gl_wdgt_merge_menu_finalize (GObject *object)
 {
@@ -130,6 +130,7 @@ gl_wdgt_merge_menu_finalize (GObject *object)
         gl_debug (DEBUG_MERGE_MENU, "END");
 }
 
+
 GtkWidget *
 gl_wdgt_merge_menu_new (void)
 {
@@ -164,6 +165,7 @@ activate_cb (GtkMenuItem     *menu_item,
         gl_debug (DEBUG_MERGE_MENU, "END");
 }
 
+
 /****************************************************************************/
 /* set field names.                                                         */
 /****************************************************************************/
@@ -207,3 +209,13 @@ gl_wdgt_merge_menu_set_fields (glWdgtMergeMenu *merge_menu,
         gl_debug (DEBUG_MERGE_MENU, "END");
 }
 
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */