evince r3583 - in trunk: . shell

[carlosgc svn gnome org]

Author: carlosgc
Date: Wed Apr  8 13:43:06 2009
New Revision: 3583
URL: http://svn.gnome.org/viewvc/evince?rev=3583&view=rev

Log:
2009-04-08  Carlos Garcia Campos  <carlosgc gnome org>

	* shell/ev-window.c: (window_open_file_copy_ready_cb),
	(reload_remote_copy_ready_cb), (window_save_file_copy_ready_cb):

	Use g_error_matches() instead of manually check error code and
	domain.

Modified:
   trunk/ChangeLog
   trunk/shell/ev-window.c

Modified: trunk/shell/ev-window.c
==============================================================================
--- trunk/shell/ev-window.c	(original)
+++ trunk/shell/ev-window.c	Wed Apr  8 13:43:06 2009
@@ -1689,8 +1689,7 @@
 		return;
 	}
 
-	if (error->domain == G_IO_ERROR &&
-	    error->code == G_IO_ERROR_NOT_MOUNTED) {
+	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED)) {
 		GMountOperation *operation;
 
 		operation = ev_mount_operation_new (GTK_WINDOW (ev_window));
@@ -1700,8 +1699,7 @@
 					       (GAsyncReadyCallback)mount_volume_ready_cb,
 					       ev_window);
 		g_object_unref (operation);
-	} else if (error->domain == G_IO_ERROR &&
-		   error->code == G_IO_ERROR_CANCELLED) {
+	} else if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
 		ev_window_clear_load_job (ev_window);
 		ev_window_clear_local_uri (ev_window);
 		g_free (ev_window->priv->uri);
@@ -1889,8 +1887,7 @@
 	
 	g_file_copy_finish (remote, async_result, &error);
 	if (error) {
-		if (error->domain != G_IO_ERROR ||
-		    error->code != G_IO_ERROR_CANCELLED)
+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
 			ev_window_error_message (ev_window, error,
 						 "%s", _("Failed to reload document."));
 		g_error_free (error);
@@ -2412,8 +2409,7 @@
 		return;
 	}
 
-	if (error->domain != G_IO_ERROR ||
-	    error->code != G_IO_ERROR_CANCELLED) {
+	if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
 		gchar *name;
 		
 		name = g_file_get_basename (dst);