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

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.

svn path=/trunk/; revision=3583

diff --git a/ChangeLog b/ChangeLog
index 73655c8ed16e332c1b79fae8ae5c09492cbe17b4..7bdf06addd9fb12006d45ba6dcdc336be27b41d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+       
 2009-04-08  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-window.c: (ev_window_clear_temp_symlink),

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 284a11f64406b681a1c1abb350b1e861c64e0a5c..909272bbd25fa4b697d04a1031abf7985cd3efc4 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1689,8 +1689,7 @@ window_open_file_copy_ready_cb (GFile        *source,
                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 @@ window_open_file_copy_ready_cb (GFile        *source,
                                               (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 @@ reload_remote_copy_ready_cb (GFile        *remote,
        
        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 @@ window_save_file_copy_ready_cb (GFile        *src,
                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);