[file-roller] fixed compiler warnings
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] fixed compiler warnings
- Date: Tue, 19 Jun 2012 18:41:08 +0000 (UTC)
commit 1becb98e4c8bc86feca13b54f991987c4eee3341
Author: Paolo Bacchilega <paobac src gnome org>
Date: Mon Jun 18 20:53:59 2012 +0200
fixed compiler warnings
src/eggtreemultidnd.c | 1 -
src/fr-archive.c | 5 +++--
src/fr-command-7z.c | 3 ++-
src/fr-command-rar.c | 3 ++-
src/fr-window.c | 19 ++++++++-----------
src/gtk-utils.c | 8 +++-----
src/rar-utils.c | 2 +-
src/rar-utils.h | 2 +-
8 files changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/src/eggtreemultidnd.c b/src/eggtreemultidnd.c
index f642fc4..a8ef368 100644
--- a/src/eggtreemultidnd.c
+++ b/src/eggtreemultidnd.c
@@ -321,7 +321,6 @@ egg_tree_multi_drag_motion_event (GtkWidget *widget,
GtkTreePath *tree_path;
int cell_x;
int cell_y;
- double cursor_pos;
target_list = gtk_target_list_new (target_table, G_N_ELEMENTS (target_table));
context = gtk_drag_begin (widget,
diff --git a/src/fr-archive.c b/src/fr-archive.c
index 9131bd0..9914026 100644
--- a/src/fr-archive.c
+++ b/src/fr-archive.c
@@ -1366,8 +1366,9 @@ create_tmp_base_dir (const char *base_dir,
dir = g_build_filename (temp_dir, "/", dest_dir, NULL);
debug (DEBUG_INFO, "symlink %s --> %s\n", dir, base_dir);
- if (! symlink (base_dir, dir))
- /* void */;
+ if (! symlink (base_dir, dir)) {
+ /* void */
+ }
g_free (dir);
g_free (dest_dir);
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index afbcb21..5bd75d6 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -33,6 +33,7 @@
#include "glib-utils.h"
#include "fr-command.h"
#include "fr-command-7z.h"
+#include "rar-utils.h"
static void fr_command_7z_class_init (FrCommand7zClass *class);
static void fr_command_7z_init (FrCommand *afile);
@@ -234,7 +235,7 @@ list__begin (gpointer data)
static void
fr_command_7z_list (FrCommand *comm)
{
- rar_check_multi_vomule (comm);
+ rar_check_multi_volume (comm);
fr_process_set_out_line_func (comm->process, list__process_line, comm);
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
index bc9f154..bd76141 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -34,6 +34,7 @@
#include "fr-command.h"
#include "fr-command-rar.h"
#include "fr-error.h"
+#include "rar-utils.h"
static void fr_command_rar_class_init (FrCommandRarClass *class);
static void fr_command_rar_init (FrCommand *afile);
@@ -228,7 +229,7 @@ list__begin (gpointer data)
static void
fr_command_rar_list (FrCommand *comm)
{
- rar_check_multi_vomule (comm);
+ rar_check_multi_volume (comm);
fr_process_set_out_line_func (comm->process, process_line, comm);
diff --git a/src/fr-window.c b/src/fr-window.c
index 0f6f068..0c2d650 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -708,8 +708,7 @@ fr_window_close (FrWindow *window)
static void
fr_window_class_init (FrWindowClass *class)
{
- GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
+ GObjectClass *gobject_class;
parent_class = g_type_class_peek_parent (class);
@@ -744,8 +743,6 @@ fr_window_class_init (FrWindowClass *class)
gobject_class = (GObjectClass*) class;
gobject_class->finalize = fr_window_finalize;
-
- widget_class = (GtkWidgetClass*) class;
}
@@ -2348,6 +2345,8 @@ get_action_description (FrAction action,
/* Translators: %s is a filename */
message = g_strdup_printf (_("Saving \"%s\""), basename);
break;
+ case FR_ACTION_NONE:
+ break;
}
g_free (basename);
@@ -2467,7 +2466,6 @@ create_the_progress_dialog (FrWindow *window)
GtkWidget *align;
GtkWidget *progress_vbox;
GtkWidget *lbl;
- char *markup;
PangoAttrList *attr_list;
GdkPixbuf *icon;
@@ -2486,6 +2484,7 @@ create_the_progress_dialog (FrWindow *window)
window->priv->progress_dialog = gtk_dialog_new_with_buttons ((window->priv->batch_mode ? window->priv->batch_title : NULL),
parent,
flags,
+ NULL,
NULL);
window->priv->pd_quit_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_QUIT, DIALOG_RESPONSE_QUIT);
@@ -6628,7 +6627,7 @@ _fr_window_archive_extract_from_edata (FrWindow *window,
}
-static gboolean _fr_window_ask_overwrite_dialog (OverwriteData *odata);
+static void _fr_window_ask_overwrite_dialog (OverwriteData *odata);
static void
@@ -6679,7 +6678,7 @@ overwrite_dialog_response_cb (GtkDialog *dialog,
}
-static gboolean
+static void
_fr_window_ask_overwrite_dialog (OverwriteData *odata)
{
gboolean do_not_extract = FALSE;
@@ -7696,7 +7695,6 @@ fr_window_rename_selection (FrWindow *window,
if (name_is_present (window, parent_dir, new_name, &reason)) {
GtkWidget *dlg;
- int r;
dlg = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
@@ -7705,7 +7703,7 @@ fr_window_rename_selection (FrWindow *window,
reason,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
- r = gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg);
g_free (reason);
g_free (new_name);
@@ -7927,7 +7925,6 @@ copy_from_archive_action_performed_cb (FrArchive *archive,
gpointer data)
{
FrWindow *window = data;
- gboolean continue_batch = FALSE;
#ifdef DEBUG
debug (DEBUG_INFO, "%s [DONE] (FR::Window)\n", action_names[action]);
@@ -7942,7 +7939,7 @@ copy_from_archive_action_performed_cb (FrArchive *archive,
return;
}
- continue_batch = handle_errors (window, archive, action, error);
+ (void) handle_errors (window, archive, action, error);
if (error->type != FR_PROC_ERROR_NONE) {
fr_clipboard_data_unref (window->priv->clipboard_data);
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 2de78ea..d66b4d5 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -74,7 +74,7 @@ _gtk_message_dialog_new (GtkWindow *parent,
if (stock_id == NULL)
stock_id = GTK_STOCK_DIALOG_INFO;
- dialog = gtk_dialog_new_with_buttons ("", parent, flags, NULL);
+ dialog = gtk_dialog_new_with_buttons ("", parent, flags, NULL, NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
/* Add label and image */
@@ -199,15 +199,13 @@ _gtk_request_dialog_run (GtkWindow *parent,
GtkWidget *entry;
GtkWidget *button;
GtkWidget *content_area;
- GtkWidget *action_area;
char *stock_id;
char *result;
stock_id = GTK_STOCK_DIALOG_QUESTION;
- dialog = gtk_dialog_new_with_buttons (title, parent, flags, NULL);
+ dialog = gtk_dialog_new_with_buttons (title, parent, flags, NULL, NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
- action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
/* Add label and image */
@@ -289,7 +287,7 @@ _gtk_yesno_dialog_new (GtkWindow *parent,
GtkWidget *content_area;
char *stock_id = GTK_STOCK_DIALOG_WARNING;
- d = gtk_dialog_new_with_buttons ("", parent, flags, NULL);
+ d = gtk_dialog_new_with_buttons ("", parent, flags, NULL, NULL);
gtk_window_set_resizable (GTK_WINDOW (d), FALSE);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (d));
diff --git a/src/rar-utils.c b/src/rar-utils.c
index fb67ef9..e3081a3 100644
--- a/src/rar-utils.c
+++ b/src/rar-utils.c
@@ -91,7 +91,7 @@ get_first_volume_name (const char *name,
void
-rar_check_multi_vomule (FrCommand *comm)
+rar_check_multi_volume (FrCommand *comm)
{
GFile *file;
char buffer[11];
diff --git a/src/rar-utils.h b/src/rar-utils.h
index 01ba9bb..416d00b 100644
--- a/src/rar-utils.h
+++ b/src/rar-utils.h
@@ -25,6 +25,6 @@
#include "fr-command.h"
-void rar_check_multi_vomule (FrCommand *comm);
+void rar_check_multi_volume (FrCommand *comm);
#endif /* RAR_UTILS_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]