summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-22 23:03:45 +0100
committerinfirit <[email protected]>2014-11-22 23:03:45 +0100
commit4a0f31e50b9a3703bde65a3ecd681058d4ab0e93 (patch)
tree0ff25c3eb7d4a622d2b9db0273adce4339de2766 /src
parent246d3cdb024f50f27fb938f143936ace5337cf05 (diff)
downloadengrampa-4a0f31e50b9a3703bde65a3ecd681058d4ab0e93.tar.bz2
engrampa-4a0f31e50b9a3703bde65a3ecd681058d4ab0e93.tar.xz
fixed missing prototype warning
From FR commit: fe3e6aa60ff370fb21475cf621fd86ad78c9303a From: Paolo Bacchilega <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/dlg-add-files.c1
-rw-r--r--src/dlg-ask-password.c4
-rw-r--r--src/dlg-batch-add.c5
-rw-r--r--src/dlg-delete.c1
-rw-r--r--src/dlg-extract.c1
-rw-r--r--src/dlg-open-with.c1
-rw-r--r--src/dlg-password.c1
-rw-r--r--src/dlg-prop.c1
-rw-r--r--src/fr-command-7z.c4
-rw-r--r--src/fr-command-ace.c6
-rw-r--r--src/fr-command-alz.c6
-rw-r--r--src/fr-command-ar.c4
-rw-r--r--src/fr-command-arj.c4
-rw-r--r--src/fr-command-cfile.c4
-rw-r--r--src/fr-command-cpio.c4
-rw-r--r--src/fr-command-dpkg.c4
-rw-r--r--src/fr-command-iso.c4
-rw-r--r--src/fr-command-jar.c4
-rw-r--r--src/fr-command-lha.c4
-rw-r--r--src/fr-command-lrzip.c4
-rw-r--r--src/fr-command-rar.c4
-rw-r--r--src/fr-command-rpm.c4
-rw-r--r--src/fr-command-tar.c4
-rw-r--r--src/fr-command-unstuff.c4
-rw-r--r--src/fr-command-zip.c4
-rw-r--r--src/fr-command-zoo.c4
-rw-r--r--src/fr-command.c4
-rw-r--r--src/fr-init.c14
-rw-r--r--src/fr-window.c2
-rw-r--r--src/rar-utils.c1
30 files changed, 60 insertions, 52 deletions
diff --git a/src/dlg-add-files.c b/src/dlg-add-files.c
index 18b70c8..b36b46b 100644
--- a/src/dlg-add-files.c
+++ b/src/dlg-add-files.c
@@ -30,6 +30,7 @@
#include "fr-window.h"
#include "gtk-utils.h"
#include "preferences.h"
+#include "dlg-add-files.h"
#if GTK_CHECK_VERSION (3, 0, 0)
#define gtk_hbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL, Y)
diff --git a/src/dlg-ask-password.c b/src/dlg-ask-password.c
index c655ba1..a29d55b 100644
--- a/src/dlg-ask-password.c
+++ b/src/dlg-ask-password.c
@@ -22,12 +22,12 @@
#include <config.h>
#include <string.h>
-
#include <gtk/gtk.h>
+#include "dlg-ask-password.h"
#include "file-utils.h"
+#include "fr-window.h"
#include "glib-utils.h"
#include "gtk-utils.h"
-#include "fr-window.h"
typedef enum {
diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c
index 35190fc..e192ca1 100644
--- a/src/dlg-batch-add.c
+++ b/src/dlg-batch-add.c
@@ -26,14 +26,15 @@
#include <unistd.h>
#include <gio/gio.h>
#include <gtk/gtk.h>
+#include "dlg-batch-add.h"
#include "file-utils.h"
+#include "fr-init.h"
#include "fr-stock.h"
#include "fr-window.h"
-#include "typedefs.h"
#include "gtk-utils.h"
#include "glib-utils.h"
#include "preferences.h"
-#include "fr-init.h"
+#include "typedefs.h"
#define ARCHIVE_ICON_SIZE (48)
diff --git a/src/dlg-delete.c b/src/dlg-delete.c
index 47c7361..e8abe86 100644
--- a/src/dlg-delete.c
+++ b/src/dlg-delete.c
@@ -25,6 +25,7 @@
#include "fr-window.h"
#include "gtk-utils.h"
#include "file-utils.h"
+#include "dlg-delete.h"
typedef struct {
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index 9a04b68..b69d211 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -30,6 +30,7 @@
#include "gtk-utils.h"
#include "fr-window.h"
#include "typedefs.h"
+#include "dlg-extract.h"
#if GTK_CHECK_VERSION (3, 0, 0)
#define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y)
diff --git a/src/dlg-open-with.c b/src/dlg-open-with.c
index 319b8c1..9533cf7 100644
--- a/src/dlg-open-with.c
+++ b/src/dlg-open-with.c
@@ -29,6 +29,7 @@
#include "gtk-utils.h"
#include "fr-init.h"
#include "fr-window.h"
+#include "dlg-open-with.h"
#define TEMP_DOCS "temp_docs"
diff --git a/src/dlg-password.c b/src/dlg-password.c
index cd2a3f8..73e8ad8 100644
--- a/src/dlg-password.c
+++ b/src/dlg-password.c
@@ -26,6 +26,7 @@
#include "fr-window.h"
#include "gtk-utils.h"
#include "preferences.h"
+#include "dlg-password.h"
typedef struct {
diff --git a/src/dlg-prop.c b/src/dlg-prop.c
index 969819a..475737d 100644
--- a/src/dlg-prop.c
+++ b/src/dlg-prop.c
@@ -27,6 +27,7 @@
#include "file-utils.h"
#include "gtk-utils.h"
#include "fr-window.h"
+#include "dlg-prop.h"
typedef struct {
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index 78c2af9..297ba1b 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -532,14 +532,14 @@ const char *sevenz_mime_types[] = { "application/x-7z-compressed",
NULL };
-const char **
+static const char **
fr_command_7z_get_mime_types (FrCommand *comm)
{
return sevenz_mime_types;
}
-FrCommandCap
+static FrCommandCap
fr_command_7z_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-ace.c b/src/fr-command-ace.c
index ce3a257..8ea045a 100644
--- a/src/fr-command-ace.c
+++ b/src/fr-command-ace.c
@@ -166,7 +166,7 @@ static void
list__begin (gpointer data)
{
FrCommandAce *comm = data;
-
+
comm->list_started = FALSE;
comm->command_type = FR_ACE_COMMAND_UNKNOWN;
}
@@ -239,14 +239,14 @@ fr_command_ace_handle_error (FrCommand *comm,
const char *ace_mime_type[] = { "application/x-ace", NULL };
-const char **
+static const char **
fr_command_ace_get_mime_types (FrCommand *comm)
{
return ace_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_ace_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-alz.c b/src/fr-command-alz.c
index 42c0b26..7b45b5c 100644
--- a/src/fr-command-alz.c
+++ b/src/fr-command-alz.c
@@ -203,7 +203,7 @@ static void
list__begin (gpointer data)
{
FrCommandAlz *comm = data;
-
+
comm->list_started = FALSE;
comm->invalid_password = FALSE;
}
@@ -301,14 +301,14 @@ fr_command_alz_handle_error (FrCommand *comm,
const char *alz_mime_type[] = { "application/x-alz", NULL };
-const char **
+static const char **
fr_command_alz_get_mime_types (FrCommand *comm)
{
return alz_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_alz_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-ar.c b/src/fr-command-ar.c
index 8b7d210..09d7640 100644
--- a/src/fr-command-ar.c
+++ b/src/fr-command-ar.c
@@ -282,14 +282,14 @@ const char *ar_mime_type[] = { "application/x-ar",
NULL };
-const char **
+static const char **
fr_command_ar_get_mime_types (FrCommand *comm)
{
return ar_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_ar_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-arj.c b/src/fr-command-arj.c
index 1efaf74..479281e 100644
--- a/src/fr-command-arj.c
+++ b/src/fr-command-arj.c
@@ -319,14 +319,14 @@ fr_command_arj_handle_error (FrCommand *comm,
const char *arj_mime_type[] = { "application/x-arj", NULL };
-const char **
+static const char **
fr_command_arj_get_mime_types (FrCommand *comm)
{
return arj_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_arj_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c
index 32f8a3a..463e156 100644
--- a/src/fr-command-cfile.c
+++ b/src/fr-command-cfile.c
@@ -466,14 +466,14 @@ const char *cfile_mime_type[] = { "application/x-gzip",
NULL };
-const char **
+static const char **
fr_command_cfile_get_mime_types (FrCommand *comm)
{
return cfile_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_cfile_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-cpio.c b/src/fr-command-cpio.c
index fd20cfc..94608d7 100644
--- a/src/fr-command-cpio.c
+++ b/src/fr-command-cpio.c
@@ -225,14 +225,14 @@ fr_command_cpio_extract (FrCommand *comm,
const char *cpio_mime_type[] = { "application/x-cpio", NULL };
-const char **
+static const char **
fr_command_cpio_get_mime_types (FrCommand *comm)
{
return cpio_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_cpio_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-dpkg.c b/src/fr-command-dpkg.c
index 7eb0b5a..3ce4f99 100644
--- a/src/fr-command-dpkg.c
+++ b/src/fr-command-dpkg.c
@@ -210,14 +210,14 @@ fr_command_dpkg_extract (FrCommand *comm,
const char *dpkg_mime_type[] = { "application/x-deb", NULL };
-const char **
+static const char **
fr_command_dpkg_get_mime_types (FrCommand *comm)
{
return dpkg_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_dpkg_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-iso.c b/src/fr-command-iso.c
index 2470554..0f1065e 100644
--- a/src/fr-command-iso.c
+++ b/src/fr-command-iso.c
@@ -202,14 +202,14 @@ fr_command_iso_extract (FrCommand *comm,
const char *iso_mime_type[] = { "application/x-cd-image", NULL };
-const char **
+static const char **
fr_command_iso_get_mime_types (FrCommand *comm)
{
return iso_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_iso_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-jar.c b/src/fr-command-jar.c
index ad15738..bc46d0a 100644
--- a/src/fr-command-jar.c
+++ b/src/fr-command-jar.c
@@ -150,14 +150,14 @@ const char *jar_mime_type[] = { "application/x-java-archive",
NULL };
-const char **
+static const char **
fr_command_jar_get_mime_types (FrCommand *comm)
{
return jar_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_jar_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-lha.c b/src/fr-command-lha.c
index 4de0e55..55a7218 100644
--- a/src/fr-command-lha.c
+++ b/src/fr-command-lha.c
@@ -304,14 +304,14 @@ fr_command_lha_extract (FrCommand *comm,
const char *lha_mime_type[] = { "application/x-lha", NULL };
-const char **
+static const char **
fr_command_lha_get_mime_types (FrCommand *comm)
{
return lha_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_lha_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-lrzip.c b/src/fr-command-lrzip.c
index 15e5f23..9e88b75 100644
--- a/src/fr-command-lrzip.c
+++ b/src/fr-command-lrzip.c
@@ -168,14 +168,14 @@ fr_command_lrzip_test (FrCommand *comm)
const char *lrzip_mime_type[] = { "application/x-lrzip", NULL };
-const char **
+static const char **
fr_command_lrzip_get_mime_types (FrCommand *comm)
{
return lrzip_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_lrzip_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
index 0809a36..2aa0eee 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -672,14 +672,14 @@ const char *rar_mime_type[] = { "application/x-cbr",
NULL };
-const char **
+static const char **
fr_command_rar_get_mime_types (FrCommand *comm)
{
return rar_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_rar_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-rpm.c b/src/fr-command-rpm.c
index b501ad2..89cd285 100644
--- a/src/fr-command-rpm.c
+++ b/src/fr-command-rpm.c
@@ -226,14 +226,14 @@ fr_command_rpm_extract (FrCommand *comm,
const char *rpm_mime_type[] = { "application/x-rpm", NULL };
-const char **
+static const char **
fr_command_rpm_get_mime_types (FrCommand *comm)
{
return rpm_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_rpm_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c
index 62818a9..fea3f03 100644
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@ -991,14 +991,14 @@ const char *tar_mime_types[] = { "application/x-compressed-tar",
NULL };
-const char **
+static const char **
fr_command_tar_get_mime_types (FrCommand *comm)
{
return tar_mime_types;
}
-FrCommandCap
+static FrCommandCap
fr_command_tar_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-unstuff.c b/src/fr-command-unstuff.c
index 9eb21ce..df1318a 100644
--- a/src/fr-command-unstuff.c
+++ b/src/fr-command-unstuff.c
@@ -279,14 +279,14 @@ fr_command_unstuff_handle_error (FrCommand *comm,
const char *unstuff_mime_type[] = { "application/x-stuffit", NULL };
-const char **
+static const char **
fr_command_unstuff_get_mime_types (FrCommand *comm)
{
return unstuff_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_unstuff_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index 748af19..064f45e 100644
--- a/src/fr-command-zip.c
+++ b/src/fr-command-zip.c
@@ -387,14 +387,14 @@ const char *zip_mime_type[] = { "application/x-cbz",
NULL };
-const char **
+static const char **
fr_command_zip_get_mime_types (FrCommand *comm)
{
return zip_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_zip_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command-zoo.c b/src/fr-command-zoo.c
index 96d7b39..790eb38 100644
--- a/src/fr-command-zoo.c
+++ b/src/fr-command-zoo.c
@@ -323,14 +323,14 @@ fr_command_zoo_test (FrCommand *comm)
const char *zoo_mime_type[] = { "application/x-zoo", NULL };
-const char **
+static const char **
fr_command_zoo_get_mime_types (FrCommand *comm)
{
return zoo_mime_type;
}
-FrCommandCap
+static FrCommandCap
fr_command_zoo_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-command.c b/src/fr-command.c
index 5cf667e..9f02b45 100644
--- a/src/fr-command.c
+++ b/src/fr-command.c
@@ -172,14 +172,14 @@ base_fr_command_handle_error (FrCommand *comm,
const char **void_mime_types = { NULL };
-const char **
+static const char **
base_fr_command_get_mime_types (FrCommand *comm)
{
return void_mime_types;
}
-FrCommandCap
+static FrCommandCap
base_fr_command_get_capabilities (FrCommand *comm,
const char *mime_type,
gboolean check_command)
diff --git a/src/fr-init.c b/src/fr-init.c
index cf567a1..acc8b44 100644
--- a/src/fr-init.c
+++ b/src/fr-init.c
@@ -204,7 +204,7 @@ migrate_options_directory (void)
/* -- FrRegisteredCommand -- */
-FrRegisteredCommand *
+static FrRegisteredCommand *
fr_registered_command_new (GType command_type)
{
FrRegisteredCommand *reg_com;
@@ -245,14 +245,14 @@ fr_registered_command_new (GType command_type)
}
-void
+G_GNUC_UNUSED static void
fr_registered_command_ref (FrRegisteredCommand *reg_com)
{
reg_com->ref++;
}
-void
+static void
fr_registered_command_unref (FrRegisteredCommand *reg_com)
{
if (--(reg_com->ref) != 0)
@@ -264,7 +264,7 @@ fr_registered_command_unref (FrRegisteredCommand *reg_com)
}
-FrCommandCaps
+static FrCommandCaps
fr_registered_command_get_capabilities (FrRegisteredCommand *reg_com,
const char *mime_type)
{
@@ -282,7 +282,7 @@ fr_registered_command_get_capabilities (FrRegisteredCommand *reg_com,
}
-FrCommandCaps
+static FrCommandCaps
fr_registered_command_get_potential_capabilities (FrRegisteredCommand *reg_com,
const char *mime_type)
{
@@ -303,7 +303,7 @@ fr_registered_command_get_potential_capabilities (FrRegisteredCommand *reg_com,
}
-void
+static void
register_command (GType command_type)
{
if (Registered_Commands == NULL)
@@ -312,7 +312,7 @@ register_command (GType command_type)
}
-gboolean
+G_GNUC_UNUSED static gboolean
unregister_command (GType command_type)
{
int i;
diff --git a/src/fr-window.c b/src/fr-window.c
index 08bc0f8..836c3ba 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -1762,7 +1762,7 @@ fr_window_update_current_location (FrWindow *window)
}
-void
+static void
fr_window_update_dir_tree (FrWindow *window)
{
GPtrArray *dirs;
diff --git a/src/rar-utils.c b/src/rar-utils.c
index e3081a3..1af3645 100644
--- a/src/rar-utils.c
+++ b/src/rar-utils.c
@@ -25,6 +25,7 @@
#include "file-utils.h"
#include "fr-command.h"
#include "gio-utils.h"
+#include "rar-utils.h"
typedef enum {