summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-21 17:34:44 +0100
committerinfirit <[email protected]>2014-11-22 20:25:30 +0100
commit28c596789cf64a2df0005362b1595a73f0ab2567 (patch)
tree39c2a31a51072abfb3500c169ab4fbb7b6c7aa3c
parente1cbfda259d2bfd2a87cda3519fd2cd69e509556 (diff)
downloadengrampa-28c596789cf64a2df0005362b1595a73f0ab2567.tar.bz2
engrampa-28c596789cf64a2df0005362b1595a73f0ab2567.tar.xz
fixed compiler warnings
Based on FR commit: 1becb98e4c8bc86feca13b54f991987c4eee3341 From: Paolo Bacchilega <[email protected]>
Diffstat
-rw-r--r--src/fr-command-7z.c3
-rw-r--r--src/fr-command-rar.c3
-rw-r--r--src/fr-window.c21
-rw-r--r--src/gtk-utils.c8
-rw-r--r--src/rar-utils.c2
-rw-r--r--src/rar-utils.h2
6 files changed, 18 insertions, 21 deletions
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index a5607f5..78c2af9 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -34,6 +34,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);
@@ -235,7 +236,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 a2236b1..0809a36 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -35,6 +35,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);
@@ -324,7 +325,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 08ec8b2..b462077 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -722,8 +722,7 @@ fr_window_close (FrWindow *window)
static void
fr_window_class_init (FrWindowClass *class)
{
- GObjectClass *gobject_class;
- GtkWidgetClass UNUSED_VARIABLE *widget_class;
+ GObjectClass *gobject_class;
parent_class = g_type_class_peek_parent (class);
@@ -739,8 +738,6 @@ fr_window_class_init (FrWindowClass *class)
gobject_class = (GObjectClass*) class;
gobject_class->finalize = fr_window_finalize;
-
- widget_class = (GtkWidgetClass*) class;
}
@@ -2336,6 +2333,8 @@ get_message_from_action (FrAction action)
default:
message = "";
break;
+ case FR_ACTION_NONE:
+ break;
}
return message;
@@ -2347,7 +2346,7 @@ progress_dialog__set_last_action (FrWindow *window,
FrAction action)
{
const char *title;
- char *markup;
+ char *markup;
window->priv->pd_last_action = action;
title = get_message_from_action (window->priv->pd_last_action);
@@ -2489,6 +2488,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);
@@ -5394,8 +5394,6 @@ fr_window_construct (FrWindow *window)
GtkActionGroup *actions;
GtkAction *action;
GtkUIManager *ui;
- GtkToolItem *open_recent_tool_item;
- GtkWidget *menu_item;
GError *error = NULL;
GSettingsSchemaSource *schema_source;
GSettingsSchema *caja_schema;
@@ -6630,7 +6628,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
@@ -6681,7 +6679,7 @@ overwrite_dialog_response_cb (GtkDialog *dialog,
}
-static gboolean
+static void
_fr_window_ask_overwrite_dialog (OverwriteData *odata)
{
gboolean do_not_extract = FALSE;
@@ -7694,7 +7692,6 @@ fr_window_rename_selection (FrWindow *window,
if (name_is_present (window, parent_dir, new_name, &reason)) {
GtkWidget *dlg;
- int UNUSED_VARIABLE r;
dlg = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
@@ -7703,7 +7700,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);
@@ -7940,7 +7937,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 40d5336..24a686a 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -79,7 +79,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 */
@@ -204,15 +204,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 */
@@ -303,7 +301,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 */
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-26 22:40:40 +0000