X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=glabels2%2Fsrc%2Fwdgt-merge-menu.h;h=2c406dcd81f963c631b81923d466025e9f65e731;hb=7e55e35f41dbbbbb2dcf285fa5fbcc9007628457;hp=60d4ac50ccbc7f50bfbdb228745d61ed806f49c4;hpb=83898579197af3dbe8fecb57c729770cd7e34694;p=glabels

diff --git a/glabels2/src/wdgt-merge-menu.h b/glabels2/src/wdgt-merge-menu.h
index 60d4ac50..2c406dcd 100644
--- a/glabels2/src/wdgt-merge-menu.h
+++ b/glabels2/src/wdgt-merge-menu.h
@@ -1,31 +1,27 @@
-/* -*- 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.h:  Merge menu widget module header file
+ *  wdgt-merge-menu.h
+ *  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/>.
  */
 
 #ifndef __WDGT_MERGE_MENU_H__
 #define __WDGT_MERGE_MENU_H__
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -73,3 +69,14 @@ void       gl_wdgt_merge_menu_set_fields    (glWdgtMergeMenu *merge_menu,
 G_END_DECLS
 
 #endif
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */