From: Jim Evins <evins@snaught.com>
Date: Wed, 23 Mar 2005 02:52:04 +0000 (+0000)
Subject: 2005-03-22  Jim Evins  <evins@snaught.com>
X-Git-Tag: glabels-2_3_0~438
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bf335f6190c755edecd76daa222ddf818c3962f7;p=glabels

2005-03-22  Jim Evins  <evins@snaught.com>

	Since the development version now requires gtk-2.6/gnome-2.10, I
	have made a first pass at removing deprecations.

	* configure.in:
	* libglabels/Makefile.am:
	* src/Makefile.am:
		Added configure option to turn on X_DISABLE_DEPRECATED flags.
		Also removed all remnants of HAVE_FILECHOOSER.
	* src/file.c: (gl_file_open_real):
		Removed code for old GtkFileSelection.
	* libglabels/libglabels-private.h:
	* libglabels/paper.c:
	* libglabels/template.c:
	* libglabels/xml-paper.c:
	* libglabels/xml-template.c:
	* libglabels/xml.c:
	* src/bc.c:
	* src/file.c:
	* src/glabels-batch.c:
	* src/glabels.c:
	* src/label.c:
	* src/merge-init.c:
	* src/merge-properties-dialog.c:
	* src/merge.c:
	* src/object-editor.c:
	* src/prefs-dialog.c:
	* src/prefs.c:
	* src/print-dialog.c:
	* src/print.c:
	* src/stock.c:
	* src/template-designer.c:
	* src/ui-property-bar.c:
	* src/ui-sidebar.c:
	* src/view-barcode.c:
	* src/view-box.c:
	* src/view-ellipse.c:
	* src/view-image.c:
	* src/view-line.c:
	* src/view-text.c:
	* src/view.c:
	* src/wdgt-image-select.c:
	* src/wdgt-media-select.c:
	* src/wdgt-print-copies.c:
	* src/wdgt-print-merge.c:
	* src/wdgt-rotate-label.c:
	* src/window.c:
	* src/xml-label-04.c:
	* src/xml-label-191.c:
	* src/xml-label.c:
		Added '#include <glib/gi18n.h>" where needed.
		Removed any unused '#include <gnome.h>"s.


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@509 f5e0f49d-192f-0410-a22d-a8d8700d0965
---

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index f1903fe1..a60aa76b 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,57 @@
+2005-03-22  Jim Evins  <evins@snaught.com>
+
+	Since the development version now requires gtk-2.6/gnome-2.10, I
+	have made a first pass at removing deprecations.
+
+	* configure.in:
+	* libglabels/Makefile.am:
+	* src/Makefile.am:
+		Added configure option to turn on X_DISABLE_DEPRECATED flags.
+		Also removed all remnants of HAVE_FILECHOOSER.
+	* src/file.c: (gl_file_open_real):
+		Removed code for old GtkFileSelection.
+	* libglabels/libglabels-private.h:
+	* libglabels/paper.c:
+	* libglabels/template.c:
+	* libglabels/xml-paper.c:
+	* libglabels/xml-template.c:
+	* libglabels/xml.c:
+	* src/bc.c:
+	* src/file.c:
+	* src/glabels-batch.c:
+	* src/glabels.c:
+	* src/label.c:
+	* src/merge-init.c:
+	* src/merge-properties-dialog.c:
+	* src/merge.c:
+	* src/object-editor.c:
+	* src/prefs-dialog.c:
+	* src/prefs.c:
+	* src/print-dialog.c:
+	* src/print.c:
+	* src/stock.c:
+	* src/template-designer.c:
+	* src/ui-property-bar.c:
+	* src/ui-sidebar.c:
+	* src/view-barcode.c:
+	* src/view-box.c:
+	* src/view-ellipse.c:
+	* src/view-image.c:
+	* src/view-line.c:
+	* src/view-text.c:
+	* src/view.c:
+	* src/wdgt-image-select.c:
+	* src/wdgt-media-select.c:
+	* src/wdgt-print-copies.c:
+	* src/wdgt-print-merge.c:
+	* src/wdgt-rotate-label.c:
+	* src/window.c:
+	* src/xml-label-04.c:
+	* src/xml-label-191.c:
+	* src/xml-label.c:
+		Added '#include <glib/gi18n.h>" where needed.
+		Removed any unused '#include <gnome.h>"s.
+
 2005-03-22  Jim Evins  <evins@snaught.com>
 
 	* src/commands.c: (activate_url), (gl_cmd_help_about):
diff --git a/glabels2/configure.in b/glabels2/configure.in
index ff53de35..ff6d2d2f 100644
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -109,12 +109,22 @@ AC_SUBST(LIBGLABELS_LIBS)
 
 
 dnl ---------------------------------------------------------------------------
-dnl - Is the new file chooser available?
-dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.3.2,
-                  HAVE_FILE_CHOOSER="-DHAVE_FILE_CHOOSER",
-                  HAVE_FILE_CHOOSER="-UHAVE_FILE_CHOOSER")
-AC_SUBST(HAVE_FILE_CHOOSER)
+dnl - Enable deprecation testing
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(deprecations,
+              [AC_HELP_STRING([--enable-deprecations],
+                              [warn about deprecated usages [default=no]])],,
+              [enable_deprecations=no])
+
+if test "x$enable_deprecations" = "xyes"; then
+   DISABLE_DEPRECATED_CFLAGS="\
+-DG_DISABLE_DEPRECATED \
+-DGDK_DISABLE_DEPRECATED \
+-DGTK_DISABLE_DEPRECATED \
+-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-DGNOME_DISABLE_DEPRECATED"
+   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+fi
 
 
 dnl ---------------------------------------------------------------------------
diff --git a/glabels2/libglabels/Makefile.am b/glabels2/libglabels/Makefile.am
index 4fa2909b..36e6c301 100644
--- a/glabels2/libglabels/Makefile.am
+++ b/glabels2/libglabels/Makefile.am
@@ -3,7 +3,8 @@ templatesdir = $(datadir)/glabels/templates
 INCLUDES = \
 	$(LIBGLABELS_CFLAGS)				\
 	-DDATADIR=\""$(datadir)"\"			\
-	-DLIBGLABELS_TEMPLATE_DIR=\""$(templatesdir)"\"
+	-DLIBGLABELS_TEMPLATE_DIR=\""$(templatesdir)"\" \
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 libglabels_la_LDFLAGS=\
         -version-info $(LIBGLABELS_VERSION_INFO) \
diff --git a/glabels2/libglabels/libglabels-private.h b/glabels2/libglabels/libglabels-private.h
index 5fed93e3..7dcc79a4 100644
--- a/glabels2/libglabels/libglabels-private.h
+++ b/glabels2/libglabels/libglabels-private.h
@@ -26,21 +26,6 @@
 #ifndef __LIBGLABELS_PRIVATE_H__
 #define __LIBGLABELS_PRIVATE_H__
 
-#include <config.h>
-
-#if ENABLE_NLS
-
-#       include <libintl.h>
-#       define _(x) dgettext (GETTEXT_PACKAGE, x)
-#       define N_(x) x
-
-#else
-
-#       define _(x) x
-#       define N_(x) x
-
-#endif
-
 /* Data system and user data directories.  (must free w/ g_free()) */
 #define GL_SYSTEM_DATA_DIR g_build_filename (LIBGLABELS_TEMPLATE_DIR, NULL)
 #define GL_USER_DATA_DIR   g_build_filename (g_get_home_dir (), ".glabels", NULL)
diff --git a/glabels2/libglabels/paper.c b/glabels2/libglabels/paper.c
index 0e3ed41e..31cc1081 100644
--- a/glabels2/libglabels/paper.c
+++ b/glabels2/libglabels/paper.c
@@ -22,11 +22,13 @@
  *  Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  *  MA 02111-1307, USA
  */
+#include <config.h>
 
-#include "libglabels-private.h"
-
+#include <glib/gi18n.h>
 #include <string.h>
 
+#include "libglabels-private.h"
+
 #include "paper.h"
 #include "xml-paper.h"
 
diff --git a/glabels2/libglabels/template.c b/glabels2/libglabels/template.c
index a01bb8c4..9fbf729e 100644
--- a/glabels2/libglabels/template.c
+++ b/glabels2/libglabels/template.c
@@ -22,11 +22,13 @@
  *  Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  *  MA 02111-1307, USA
  */
+#include <config.h>
 
-#include "libglabels-private.h"
-
+#include <glib/gi18n.h>
 #include <string.h>
 
+#include "libglabels-private.h"
+
 #include "xml.h"
 #include "template.h"
 #include "xml-template.h"
diff --git a/glabels2/libglabels/xml-paper.c b/glabels2/libglabels/xml-paper.c
index e9425319..7afd0512 100644
--- a/glabels2/libglabels/xml-paper.c
+++ b/glabels2/libglabels/xml-paper.c
@@ -22,12 +22,14 @@
  *  Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  *  MA 02111-1307, USA
  */
+#include <config.h>
 
-#include "libglabels-private.h"
-
+#include <glib/gi18n.h>
 #include <string.h>
 #include <libintl.h>
 
+#include "libglabels-private.h"
+
 #include "xml.h"
 #include "xml-paper.h"
 
diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c
index 4d93409c..fb4365eb 100644
--- a/glabels2/libglabels/xml-template.c
+++ b/glabels2/libglabels/xml-template.c
@@ -22,12 +22,14 @@
  *  Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  *  MA 02111-1307, USA
  */
+#include <config.h>
 
-#include "libglabels-private.h"
-
+#include <glib/gi18n.h>
 #include <string.h>
 #include <libintl.h>
 
+#include "libglabels-private.h"
+
 #include "paper.h"
 #include "xml.h"
 #include "xml-template.h"
diff --git a/glabels2/libglabels/xml.c b/glabels2/libglabels/xml.c
index cf36f056..3f331deb 100644
--- a/glabels2/libglabels/xml.c
+++ b/glabels2/libglabels/xml.c
@@ -22,6 +22,9 @@
  *  Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  *  MA 02111-1307, USA
  */
+#include <config.h>
+
+#include <glib/gi18n.h>
 
 #include "libglabels-private.h"
 
diff --git a/glabels2/src/Makefile.am b/glabels2/src/Makefile.am
index 63c12e78..d23bc4e8 100644
--- a/glabels2/src/Makefile.am
+++ b/glabels2/src/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = \
 	-DGLABELS_LOCALEDIR=\""$(datadir)/locale"\" 		\
 	-DGLABELS_UI_DIR=\""$(datadir)/glabels/ui/"\" 		\
 	-DGLABELS_GLADE_DIR=\""$(datadir)/glabels/glade/"\"	\
-	$(HAVE_FILE_CHOOSER)
+	$(DISABLE_DEPRECATED_CFLAGS)
 
 glabels_LDFLAGS = -export-dynamic
 
diff --git a/glabels2/src/bc.c b/glabels2/src/bc.c
index df561c82..ab1c201d 100644
--- a/glabels2/src/bc.c
+++ b/glabels2/src/bc.c
@@ -21,7 +21,7 @@
  */
 #include <config.h>
 
-#include <libgnome/libgnome.h>
+#include <glib/gi18n.h>
 
 #include "bc.h"
 #include "bc-postnet.h"
diff --git a/glabels2/src/file.c b/glabels2/src/file.c
index 68508727..267830c8 100644
--- a/glabels2/src/file.c
+++ b/glabels2/src/file.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "xml-label.h"
@@ -65,24 +65,12 @@ static void properties_response              (GtkDialog         *dlg,
 					      gint               response,
 					      gpointer           user_data);
 
-#ifdef HAVE_FILE_CHOOSER
 static void open_response                    (GtkDialog         *chooser,
 					      gint               response,
 					      GtkWindow         *window);
 static void save_as_response                 (GtkDialog         *chooser,
 					      gint               response,
 					      glLabel           *label);
-#else
-static void open_ok                          (GtkWidget         *widget,
-					      GtkFileSelection  *fsel);
-static void save_as_ok_cb                    (GtkWidget         *widget,
-					      GtkFileSelection  *fsel);
-static void save_as_cancel_cb                (GtkWidget         *widget,
-					      GtkFileSelection  *fsel);
-static void save_as_destroy_cb               (GtkWidget         *widget,
-					      gboolean          *destroy_flag);
-#endif
-
 
 
 /*****************************************************************************/
@@ -419,8 +407,6 @@ properties_response (GtkDialog *dlg,
 	gl_debug (DEBUG_FILE, "END");
 }
 
-#ifdef HAVE_FILE_CHOOSER
-
 /*****************************************************************************/
 /* "Open" menu callback.                                                     */
 /*****************************************************************************/
@@ -546,114 +532,6 @@ open_response (GtkDialog     *chooser,
 	gl_debug (DEBUG_FILE, "END");
 }
 
-#else
-
-/*****************************************************************************/
-/* "Open" menu callback.                                                     */
-/*****************************************************************************/
-void
-gl_file_open (GtkWindow *window)
-{
-	GtkFileSelection *fsel;
-
-	gl_debug (DEBUG_FILE, "START");
-
-	g_return_if_fail (window != NULL);
-
-	fsel = GTK_FILE_SELECTION (gtk_file_selection_new (_("Open")));
-	gtk_window_set_transient_for (GTK_WINDOW (fsel), window);
-	gtk_window_set_title (GTK_WINDOW (fsel), _("Open label"));
-
-	g_object_set_data (G_OBJECT (fsel), "parent_window", window);
-
-	g_signal_connect (G_OBJECT (fsel->ok_button), "clicked",
-			  G_CALLBACK (open_ok), fsel);
-
-	g_signal_connect_swapped (G_OBJECT (fsel->cancel_button), "clicked",
-				  G_CALLBACK (gtk_widget_destroy),
-				  G_OBJECT (fsel));
-
-	/* Recover state of open dialog */
-	if (open_path != NULL) {
-		gtk_file_selection_set_filename (fsel, open_path);
-	}
-
-	/* show the dialog */
-	gtk_widget_show (GTK_WIDGET (fsel));
-
-	gl_debug (DEBUG_FILE, "END");
-}
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE.  Open "O.K." button callback.                                    */
-/*---------------------------------------------------------------------------*/
-static void
-open_ok (GtkWidget        *widget,
-	 GtkFileSelection *fsel)
-{
-	gchar            *raw_filename;
-	gchar 		 *filename;
-	GtkWidget        *dlg;
-	gint              ret;
-	EggRecentModel 	 *recent;
-	GtkWindow        *window;
-
-	gl_debug (DEBUG_FILE, "START");
-
-	g_return_if_fail (GTK_IS_FILE_SELECTION (fsel));
-
-	/* get the filename */
-	raw_filename = g_strdup (gtk_file_selection_get_filename (fsel));
-	filename = g_filename_to_utf8 (raw_filename, -1, NULL, NULL, NULL);
-
-	if (!raw_filename || 
-	    !filename || 
-	    g_file_test (raw_filename, G_FILE_TEST_IS_DIR)) {
-
-		dlg = gl_hig_alert_new (GTK_WINDOW(fsel),
-					GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					GTK_MESSAGE_WARNING,
-					GTK_BUTTONS_CLOSE,
-					_("Empty file name selection"),
-					_("Please select a file or supply a valid file name"));
-
-		gtk_dialog_run (GTK_DIALOG (dlg));
-		gtk_widget_destroy (dlg);
-
-	} else {
-
-		if (!g_file_test (raw_filename, G_FILE_TEST_IS_REGULAR)) {
-
-			dlg = gl_hig_alert_new (GTK_WINDOW(fsel),
-						GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-						GTK_MESSAGE_WARNING,
-						GTK_BUTTONS_CLOSE,
-						_("File does not exist"),
-						_("Please select a file or supply a valid file name"));
-
-			gtk_dialog_run (GTK_DIALOG (dlg));
-			gtk_widget_destroy (dlg);
-
-
-		} else {
-		
-			window = g_object_get_data (G_OBJECT(fsel),
-						    "parent_window");
-
-			if ( gl_file_open_real (filename, window) ) {
-				gtk_widget_destroy (GTK_WIDGET (fsel));
-			}
-
-		}
-
-	}
-
-	g_free (filename);
-	g_free (raw_filename);
-
-	gl_debug (DEBUG_FILE, "END");
-}
-#endif
 
 /*****************************************************************************/
 /* "Open recent" menu callback.                                              */
@@ -739,10 +617,6 @@ gl_file_open_real (const gchar     *filename,
 		if (open_path != NULL)
 			g_free (open_path);
 		open_path = g_path_get_dirname (abs_filename);
-#ifndef HAVE_FILE_CHOOSER
-		if (open_path != NULL)
-			open_path = g_strconcat (open_path, "/", NULL);
-#endif
 		g_free (abs_filename);
 
 		gl_debug (DEBUG_FILE, "END true");
@@ -825,8 +699,6 @@ gl_file_save (glLabel   *label,
 	}
 }
 
-#ifdef HAVE_FILE_CHOOSER
-
 /*****************************************************************************/
 /* "Save As" menu callback.                                                  */
 /*****************************************************************************/
@@ -1025,221 +897,6 @@ save_as_response (GtkDialog     *chooser,
 	gl_debug (DEBUG_FILE, "END");
 }
 
-#else
-
-/*****************************************************************************/
-/* "Save As" menu callback.                                                  */
-/*****************************************************************************/
-gboolean
-gl_file_save_as (glLabel   *label,
-		 GtkWindow *window)
-{
-	GtkFileSelection *fsel;
-	gboolean          saved_flag = FALSE;
-	gboolean          destroy_flag = FALSE;
-	gchar            *name, *title;
-
-	gl_debug (DEBUG_FILE, "START");
-
-	g_return_val_if_fail (label && GL_IS_LABEL(label), FALSE);
-	g_return_val_if_fail (window && GTK_IS_WINDOW(window), FALSE);
-
-	name = gl_label_get_short_name (label);
-	title = g_strdup_printf (_("Save \"%s\" as"), name);
-	g_free (name);
-
-	fsel = GTK_FILE_SELECTION (gtk_file_selection_new (title));
-	gtk_window_set_modal (GTK_WINDOW (fsel), TRUE);
-	gtk_window_set_transient_for (GTK_WINDOW (fsel), window);
-
-	g_object_set_data (G_OBJECT (fsel), "label", label);
-	g_object_set_data (G_OBJECT (fsel), "saved_flag", &saved_flag);
-
-	g_signal_connect (G_OBJECT (fsel->ok_button), "clicked",
-			  G_CALLBACK (save_as_ok_cb), fsel);
-
-	g_signal_connect (G_OBJECT (fsel->cancel_button), "clicked",
-			  G_CALLBACK (save_as_cancel_cb), fsel);
-
-	g_signal_connect (G_OBJECT (fsel), "destroy",
-			  G_CALLBACK (save_as_destroy_cb), &destroy_flag);
-
-	/* Recover proper state of save-as dialog */
-	if (save_path != NULL) {
-		gtk_file_selection_set_filename (fsel, save_path);
-	}
-
-	/* show the dialog */
-	gtk_widget_show (GTK_WIDGET (fsel));
-
-	/* Hold here and process events until we are done with this dialog. */
-	gtk_main ();
-
-	/* Destroy dialog if not already destroyed. */
-	if (!destroy_flag) {
-		/* Disconnect our destroy callback first, so that we don't
-		 * kill the current gtk_main() loop. */
-		g_signal_handlers_disconnect_by_func (GTK_OBJECT (fsel),
-						      G_CALLBACK (save_as_destroy_cb),
-						      &destroy_flag);
-		gtk_widget_destroy (GTK_WIDGET (fsel));
-	}
-
-	g_free (title);
-
-	gl_debug (DEBUG_FILE, "END");
-
-	/* Return flag as set by one of the above callbacks, TRUE = saved */
-	return saved_flag;
-}
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE.  "Save As" ok button callback.                                   */
-/*---------------------------------------------------------------------------*/
-static void
-save_as_ok_cb (GtkWidget        *widget,
-	       GtkFileSelection *fsel)
-{
-	gchar            *raw_filename, *filename, *full_filename;
-	GtkWidget        *dlg;
-	glLabel          *label;
-	glXMLLabelStatus  status;
-	EggRecentModel   *recent;
-	gboolean         *saved_flag;
-	gchar            *primary_msg;
-	gboolean          cancel_flag = FALSE;
-
-	gl_debug (DEBUG_FILE, "START");
-
-	g_return_if_fail (GTK_IS_FILE_SELECTION (fsel));
-
-	label = g_object_get_data (G_OBJECT(fsel), "label");
-	saved_flag = g_object_get_data (G_OBJECT(fsel), "saved_flag");
-
-	/* get the filename */
-	raw_filename = g_strdup (gtk_file_selection_get_filename (fsel));
-
-	gl_debug (DEBUG_FILE, "raw_filename = \"%s\"", raw_filename);
-
-	if (!raw_filename || g_file_test (raw_filename, G_FILE_TEST_IS_DIR)) {
-
-		dlg = gl_hig_alert_new (GTK_WINDOW(fsel),
-					GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					GTK_MESSAGE_WARNING,
-					GTK_BUTTONS_CLOSE,
-					_("Empty file name selection"),
-					_("Please supply a valid file name"));
-
-		gtk_dialog_run (GTK_DIALOG (dlg));
-		gtk_widget_destroy (dlg);
-
-	} else {
-
-		full_filename = gl_util_add_extension (raw_filename);
-
-		filename = g_filename_to_utf8 (full_filename, -1, NULL, NULL, NULL);
-
-		gl_debug (DEBUG_FILE, "filename = \"%s\"", filename);
-
-		if (g_file_test (full_filename, G_FILE_TEST_IS_REGULAR)) {
-			gint ret;
-
-			primary_msg = g_strdup_printf (_("Overwrite file \"%s\"?"),
-						       filename);
-
-			dlg = gl_hig_alert_new (GTK_WINDOW(fsel),
-						GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-						GTK_MESSAGE_QUESTION,
-						GTK_BUTTONS_YES_NO,
-						primary_msg,
-						_("File already exists."));
-			
-			g_free (primary_msg);
-
-			ret = gtk_dialog_run (GTK_DIALOG (dlg));
-			if ( ret == GTK_RESPONSE_NO ) {
-				cancel_flag = TRUE;
-			}
-			gtk_widget_destroy (dlg);
-		}
-
-		if (!cancel_flag) {
-
-			gl_xml_label_save (label, filename, &status);
-
-			gl_debug (DEBUG_FILE, "status of save = %d", status);
-
-			if ( status != XML_LABEL_OK ) {
-
-				primary_msg = g_strdup_printf (_("Could not save file \"%s\""),
-							       filename);
-
-				dlg = gl_hig_alert_new (GTK_WINDOW(fsel),
-							GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-							GTK_MESSAGE_ERROR,
-							GTK_BUTTONS_CLOSE,
-							primary_msg,
-							_("Error encountered during save.  The file is still not saved."));
-
-				g_free (primary_msg);
-
-				gtk_dialog_run (GTK_DIALOG (dlg));
-				gtk_widget_destroy (dlg);
-
-			} else {
-
-				*saved_flag = TRUE;
-
-				gl_recent_add_uri (filename);
-
-				if (save_path != NULL)
-					g_free (save_path);
-				save_path = g_path_get_dirname (filename);
-				if (save_path != NULL)
-					save_path = g_strconcat (save_path, "/", NULL);
-
-				gtk_widget_destroy (GTK_WIDGET (fsel));
-			}
-
-		}
-
-		g_free (filename);
-		g_free (full_filename);
-	}
-
-	g_free (raw_filename);
-
-	gl_debug (DEBUG_FILE, "END");
-}
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE.  "Save As" cancel button callback.                               */
-/*---------------------------------------------------------------------------*/
-static void
-save_as_cancel_cb (GtkWidget        *widget,
-		   GtkFileSelection *fsel)
-{
-	gboolean *saved_flag = g_object_get_data (G_OBJECT (fsel), "saved_flag");
-
-	g_return_if_fail (GTK_IS_FILE_SELECTION (fsel));
-
-	*saved_flag = FALSE;
-	gtk_widget_hide (GTK_WIDGET (fsel));
-	gtk_main_quit ();
-}
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE.  "Save As" destroy callback.                                     */
-/*---------------------------------------------------------------------------*/
-static void
-save_as_destroy_cb (GtkWidget *widget,
-		    gboolean  *destroy_flag)
-{
-	*destroy_flag = TRUE;
-	gtk_main_quit ();
-}
-
-#endif
 
 /*****************************************************************************/
 /* "Close" menu callback.                                                    */
diff --git a/glabels2/src/glabels-batch.c b/glabels2/src/glabels-batch.c
index 509836b9..ca307535 100644
--- a/glabels2/src/glabels-batch.c
+++ b/glabels2/src/glabels-batch.c
@@ -22,7 +22,8 @@
 
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <libgnome/libgnome.h>
 #include <libgnomeprint/gnome-print-job.h>
 
 #include "merge-init.h"
diff --git a/glabels2/src/glabels.c b/glabels2/src/glabels.c
index 0414be1c..f241841e 100644
--- a/glabels2/src/glabels.c
+++ b/glabels2/src/glabels.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <libgnome/libgnome.h>
 #include <libgnomeui/libgnomeui.h>
 #include <libgnomeui/gnome-window-icon.h>
diff --git a/glabels2/src/label.c b/glabels2/src/label.c
index e2e097bf..678427f5 100644
--- a/glabels2/src/label.c
+++ b/glabels2/src/label.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "label.h"
 #include "label-object.h"
diff --git a/glabels2/src/merge-init.c b/glabels2/src/merge-init.c
index a5e585af..cb6f2632 100644
--- a/glabels2/src/merge-init.c
+++ b/glabels2/src/merge-init.c
@@ -21,7 +21,7 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "merge-init.h"
 #include "merge-text.h"
diff --git a/glabels2/src/merge-properties-dialog.c b/glabels2/src/merge-properties-dialog.c
index 1eca27e8..e76bdfaa 100644
--- a/glabels2/src/merge-properties-dialog.c
+++ b/glabels2/src/merge-properties-dialog.c
@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <glib/gi18n.h>
+
 #include "view.h"
 #include "merge.h"
 #include "merge-properties-dialog.h"
diff --git a/glabels2/src/merge.c b/glabels2/src/merge.c
index d5f2b87d..2edebc10 100644
--- a/glabels2/src/merge.c
+++ b/glabels2/src/merge.c
@@ -21,7 +21,7 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 #include <gobject/gvaluecollector.h>
 #include <string.h>
 
diff --git a/glabels2/src/object-editor.c b/glabels2/src/object-editor.c
index 19b239cd..ac4f08f5 100644
--- a/glabels2/src/object-editor.c
+++ b/glabels2/src/object-editor.c
@@ -21,7 +21,7 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 #include <glade/glade-xml.h>
 #include <math.h>
 
diff --git a/glabels2/src/prefs-dialog.c b/glabels2/src/prefs-dialog.c
index 2f5d42ab..b5f43dd8 100644
--- a/glabels2/src/prefs-dialog.c
+++ b/glabels2/src/prefs-dialog.c
@@ -21,6 +21,7 @@
  */
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <libgnome/libgnome.h>
 #include <libgnomeui/libgnomeui.h>
 #include <glade/glade-xml.h>
diff --git a/glabels2/src/prefs.c b/glabels2/src/prefs.c
index 4f5bcde9..9dc59790 100644
--- a/glabels2/src/prefs.c
+++ b/glabels2/src/prefs.c
@@ -21,7 +21,7 @@
  */
 #include <config.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "prefs-model.h"
 
diff --git a/glabels2/src/print-dialog.c b/glabels2/src/print-dialog.c
index 62fbf0d0..f0d9de39 100644
--- a/glabels2/src/print-dialog.c
+++ b/glabels2/src/print-dialog.c
@@ -21,6 +21,7 @@
  */
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <math.h>
 #include <time.h>
 #include <ctype.h>
diff --git a/glabels2/src/print.c b/glabels2/src/print.c
index c6914822..573ef143 100644
--- a/glabels2/src/print.c
+++ b/glabels2/src/print.c
@@ -21,6 +21,7 @@
  */
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <math.h>
 #include <time.h>
 #include <ctype.h>
diff --git a/glabels2/src/stock.c b/glabels2/src/stock.c
index f6235e3b..98afb932 100644
--- a/glabels2/src/stock.c
+++ b/glabels2/src/stock.c
@@ -21,7 +21,10 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtkiconfactory.h>
+#include <gtk/gtkstock.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 #include "stock.h"
 #include "stock-pixmaps/stockpixbufs.h"
diff --git a/glabels2/src/template-designer.c b/glabels2/src/template-designer.c
index 18b6d78f..22f4f5f4 100644
--- a/glabels2/src/template-designer.c
+++ b/glabels2/src/template-designer.c
@@ -21,6 +21,7 @@
  */
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <math.h>
 #include <libgnome/libgnome.h>
 #include <libgnomeui/libgnomeui.h>
diff --git a/glabels2/src/ui-property-bar.c b/glabels2/src/ui-property-bar.c
index 17433bf1..bd7fc837 100644
--- a/glabels2/src/ui-property-bar.c
+++ b/glabels2/src/ui-property-bar.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <libgnomeprint/gnome-font.h>
 
 #include "ui-property-bar.h"
diff --git a/glabels2/src/ui-sidebar.c b/glabels2/src/ui-sidebar.c
index 4487f13b..90f0d70e 100644
--- a/glabels2/src/ui-sidebar.c
+++ b/glabels2/src/ui-sidebar.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <libgnomeprint/gnome-font.h>
 
 #include "ui-sidebar.h"
diff --git a/glabels2/src/view-barcode.c b/glabels2/src/view-barcode.c
index 61cb043f..70f9d4e8 100644
--- a/glabels2/src/view-barcode.c
+++ b/glabels2/src/view-barcode.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <glib.h>
-
+#include <glib/gi18n.h>
 #include <libgnomeprint/gnome-glyphlist.h>
 
 #include "view-barcode.h"
diff --git a/glabels2/src/view-box.c b/glabels2/src/view-box.c
index d61ec032..bd05217f 100644
--- a/glabels2/src/view-box.c
+++ b/glabels2/src/view-box.c
@@ -22,9 +22,9 @@
 #include <config.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "view-box.h"
-
 #include "view-highlight.h"
 
 #include "color.h"
diff --git a/glabels2/src/view-ellipse.c b/glabels2/src/view-ellipse.c
index f4d14123..e8d99bbc 100644
--- a/glabels2/src/view-ellipse.c
+++ b/glabels2/src/view-ellipse.c
@@ -22,9 +22,9 @@
 #include <config.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "view-ellipse.h"
-
 #include "view-highlight.h"
 
 #include "color.h"
diff --git a/glabels2/src/view-image.c b/glabels2/src/view-image.c
index eb122e9a..42f3ab06 100644
--- a/glabels2/src/view-image.c
+++ b/glabels2/src/view-image.c
@@ -22,9 +22,9 @@
 #include <config.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "view-image.h"
-
 #include "view-highlight.h"
 
 #include "color.h"
diff --git a/glabels2/src/view-line.c b/glabels2/src/view-line.c
index 67e42245..3c2b9f82 100644
--- a/glabels2/src/view-line.c
+++ b/glabels2/src/view-line.c
@@ -22,9 +22,9 @@
 #include <config.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "view-line.h"
-
 #include "view-highlight.h"
 
 #include "color.h"
diff --git a/glabels2/src/view-text.c b/glabels2/src/view-text.c
index 9e5a054a..f6c5bfd2 100644
--- a/glabels2/src/view-text.c
+++ b/glabels2/src/view-text.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <glib.h>
-
+#include <glib/gi18n.h>
 #include <libgnomeprint/gnome-glyphlist.h>
 
 #include "view-text.h"
diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index bd456d3a..c302dcca 100644
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -22,9 +22,9 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkinvisible.h>
-
 #include <string.h>
 #include <math.h>
 
diff --git a/glabels2/src/wdgt-image-select.c b/glabels2/src/wdgt-image-select.c
index 3b8e044f..ff50938b 100644
--- a/glabels2/src/wdgt-image-select.c
+++ b/glabels2/src/wdgt-image-select.c
@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
+
 #include "wdgt-image-select.h"
 #include "merge.h"
 #include "marshal.h"
diff --git a/glabels2/src/wdgt-media-select.c b/glabels2/src/wdgt-media-select.c
index 6ad73a0c..18706503 100644
--- a/glabels2/src/wdgt-media-select.c
+++ b/glabels2/src/wdgt-media-select.c
@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
+
 #include "wdgt-media-select.h"
 #include "hig.h"
 #include "wdgt-mini-preview.h"
diff --git a/glabels2/src/wdgt-print-copies.c b/glabels2/src/wdgt-print-copies.c
index ca202671..d98e93e9 100644
--- a/glabels2/src/wdgt-print-copies.c
+++ b/glabels2/src/wdgt-print-copies.c
@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
+
 #include "wdgt-print-copies.h"
 #include "wdgt-mini-preview.h"
 #include "marshal.h"
diff --git a/glabels2/src/wdgt-print-merge.c b/glabels2/src/wdgt-print-merge.c
index 290e6a28..578863a4 100644
--- a/glabels2/src/wdgt-print-merge.c
+++ b/glabels2/src/wdgt-print-merge.c
@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
+
 #include "wdgt-print-merge.h"
 #include "wdgt-mini-preview.h"
 #include "marshal.h"
diff --git a/glabels2/src/wdgt-rotate-label.c b/glabels2/src/wdgt-rotate-label.c
index e8d21884..ba9d35a3 100644
--- a/glabels2/src/wdgt-rotate-label.c
+++ b/glabels2/src/wdgt-rotate-label.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
 #include <math.h>
 
 #include "wdgt-rotate-label.h"
diff --git a/glabels2/src/window.c b/glabels2/src/window.c
index 8ab46636..fdbcf091 100644
--- a/glabels2/src/window.c
+++ b/glabels2/src/window.c
@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <glib/gi18n.h>
+
 #include "ui.h"
 #include "window.h"
 #include "util.h"
diff --git a/glabels2/src/xml-label-04.c b/glabels2/src/xml-label-04.c
index aebce114..6506ec9a 100644
--- a/glabels2/src/xml-label-04.c
+++ b/glabels2/src/xml-label-04.c
@@ -24,6 +24,8 @@
 
 #include <gnome.h>
 
+#include <glib/gi18n.h>
+
 #include "xml-label-04.h"
 #include "label-text.h"
 #include "label-box.h"
diff --git a/glabels2/src/xml-label-191.c b/glabels2/src/xml-label-191.c
index 54d83f2b..4327d684 100644
--- a/glabels2/src/xml-label-191.c
+++ b/glabels2/src/xml-label-191.c
@@ -24,6 +24,7 @@
 
 #include <gnome.h>
 
+#include <glib/gi18n.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
diff --git a/glabels2/src/xml-label.c b/glabels2/src/xml-label.c
index f420a2d2..8b0f53c2 100644
--- a/glabels2/src/xml-label.c
+++ b/glabels2/src/xml-label.c
@@ -24,6 +24,7 @@
 
 #include <gnome.h>
 
+#include <glib/gi18n.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <gdk-pixbuf/gdk-pixdata.h>