[file-roller: 24/123] removed use of the macros where not needed

[Paolo Bacchilega <paobac src gnome org>]

commit 0855a8c9c8f9a001e106b9ad75d49a7439424a0a
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Jul 20 22:46:24 2012 +0200

    removed use of the macros where not needed

 src/fr-archive.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/src/fr-archive.c b/src/fr-archive.c
index 51ac292..77b0026 100644
--- a/src/fr-archive.c
+++ b/src/fr-archive.c
@@ -65,6 +65,8 @@ char *action_names[] = { "NONE",
 			 "PASTING_FILES" };
 
 
+G_DEFINE_TYPE (FrArchive, fr_archive, G_TYPE_OBJECT)
+
 
 struct _FrArchivePrivate {
 	/* propeties */
@@ -92,12 +94,6 @@ enum {
 };
 
 
-static guint fr_archive_signals[LAST_SIGNAL] = { 0 };
-
-
-G_DEFINE_TYPE (FrArchive, fr_archive, G_TYPE_OBJECT)
-
-
 /* Properties */
 enum {
         PROP_0,
@@ -110,6 +106,9 @@ enum {
 };
 
 
+static guint fr_archive_signals[LAST_SIGNAL] = { 0 };
+
+
 static void
 _fr_archive_set_file (FrArchive *self,
 		      GFile     *file)
@@ -387,7 +386,7 @@ fr_archive_class_init (FrArchiveClass *klass)
 			      G_TYPE_NONE,
 			      1, G_TYPE_BOOLEAN);
 	fr_archive_signals[WORKING_ARCHIVE] =
-		g_signal_new ("working_archive",
+		g_signal_new ("working-archive",
 			      G_TYPE_FROM_CLASS (klass),
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (FrArchiveClass, working_archive),
@@ -404,7 +403,7 @@ fr_archive_init (FrArchive *self)
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FR_TYPE_ARCHIVE, FrArchivePrivate);
 
 	self->mime_type = NULL;
-	self->files = g_ptr_array_sized_new (FILES_ARRAY_INITIAL_SIZE);
+	self->files = g_ptr_array_sized_new (FILE_ARRAY_INITIAL_SIZE);
 	self->n_regular_files = 0;
         self->password = NULL;
         self->encrypt_header = FALSE;
@@ -1005,12 +1004,12 @@ fr_archive_add_with_wildcard (FrArchive           *archive,
 				source_dir,
 				TRUE,
 				follow_links,
-				NO_BACKUP_FILES,
-				NO_DOT_FILES,
+				TRUE,
+				FALSE,
 				include_files,
 				exclude_files,
 				exclude_folders,
-				IGNORE_CASE,
+				FALSE,
 				aww_data->cancellable,
 				add_with_wildcard__step2,
 				aww_data);