Imported Upstream version 3.0.0

[glabels] / src / warning-handler.c

diff --git a/src/warning-handler.c b/src/warning-handler.c
index 84e32441a5e3f8f9bac27fd953cac58c7f394249..8f5f1b7af419483c0592d8e3c75000e128caed8e 100644 (file)
--- a/src/warning-handler.c
+++ b/src/warning-handler.c
@@ -1,35 +1,30 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  warning-handler.c:  non-critical error handler
+ *  warning-handler.c
+ *  Copyright (C) 2005-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
 
 #include "warning-handler.h"
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
 
 static void warning_handler (const gchar    *log_domain,
@@ -37,7 +32,7 @@ static void warning_handler (const gchar    *log_domain,
                              const gchar    *message,
                              gpointer        user_data);
 
-\f
+
 /***************************************************************************/
 /* Initialize error handler.                                               */
 /***************************************************************************/
@@ -55,6 +50,7 @@ gl_warning_handler_init (void)
                            "glabels");
 }
 
+
 /*-------------------------------------------------------------------------*/
 /* PRIVATE.  Actual error handler.                                         */
 /*-------------------------------------------------------------------------*/
@@ -79,3 +75,13 @@ warning_handler (const gchar    *log_domain,
        gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */