diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-01-23 21:50:39 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-01-23 21:51:38 -0500 |
| commit | d9fcc4c630f3668dd014c258c2deb22d61e438d0 (patch) | |
| tree | 8b08e3e470f98aaa23173d19a6ab99fc4d12691d /gtk/gtkrecentmanager.c | |
| parent | 94c4a312c1eceb352dea1895f868f9943735e1aa (diff) | |
| download | gtk+-d9fcc4c630f3668dd014c258c2deb22d61e438d0.tar.gz | |
Silence new gcc warnings
gcc 4.6.0 has started to warn about set-but-unused variables.
So don't do that, then.
Diffstat (limited to 'gtk/gtkrecentmanager.c')
| -rw-r--r-- | gtk/gtkrecentmanager.c | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 4c4f70a376..655e160402 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -1189,59 +1189,58 @@ gtk_recent_manager_lookup_item (GtkRecentManager *manager, * Return value: %TRUE on success. * * Since: 2.10 - */ + */ gboolean gtk_recent_manager_move_item (GtkRecentManager *recent_manager, - const gchar *uri, - const gchar *new_uri, - GError **error) + const gchar *uri, + const gchar *new_uri, + GError **error) { GtkRecentManagerPrivate *priv; GError *move_error; - gboolean res; - + g_return_val_if_fail (GTK_IS_RECENT_MANAGER (recent_manager), FALSE); g_return_val_if_fail (uri != NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - + priv = recent_manager->priv; if (!priv->recent_items) { g_set_error (error, GTK_RECENT_MANAGER_ERROR, - GTK_RECENT_MANAGER_ERROR_NOT_FOUND, - _("Unable to find an item with URI '%s'"), - uri); + GTK_RECENT_MANAGER_ERROR_NOT_FOUND, + _("Unable to find an item with URI '%s'"), + uri); return FALSE; } if (!g_bookmark_file_has_item (priv->recent_items, uri)) { g_set_error (error, GTK_RECENT_MANAGER_ERROR, - GTK_RECENT_MANAGER_ERROR_NOT_FOUND, - _("Unable to find an item with URI '%s'"), - uri); + GTK_RECENT_MANAGER_ERROR_NOT_FOUND, + _("Unable to find an item with URI '%s'"), + uri); return FALSE; } - + move_error = NULL; - res = g_bookmark_file_move_item (priv->recent_items, - uri, new_uri, - &move_error); - if (move_error) + if (!g_bookmark_file_move_item (priv->recent_items, + uri, + new_uri, + &move_error)) { g_error_free (move_error); g_set_error (error, GTK_RECENT_MANAGER_ERROR, - GTK_RECENT_MANAGER_ERROR_NOT_FOUND, - _("Unable to find an item with URI '%s'"), - uri); + GTK_RECENT_MANAGER_ERROR_NOT_FOUND, + _("Unable to find an item with URI '%s'"), + uri); return FALSE; } - + priv->is_dirty = TRUE; gtk_recent_manager_changed (recent_manager); - + return TRUE; } |