Replace hardcoded collection filename extension by a macro (GQ_COLLECTION_EXT).

diff --git a/src/bar_sort.c b/src/bar_sort.c
index 1d4c345..e76069d 100644 (file)
--- a/src/bar_sort.c
+++ b/src/bar_sort.c
@@ -110,7 +110,7 @@ static void bar_sort_collection_list_build(GtkWidget *bookmarks)
                fd = work->data;
                work = work->next;
 
-               if (file_extension_match(fd->path, ".gqv"))
+               if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
                        {
                        name = remove_extension_from_path(fd->name);
                        }
@@ -425,9 +425,9 @@ static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
        
                if (strlen(name) == 0) return;
 
-               if (!file_extension_match(name, ".gqv"))
+               if (!file_extension_match(name, GQ_COLLECTION_EXT))
                        {
-                       gchar *tmp = g_strconcat(name, ".gqv", NULL);
+                       gchar *tmp = g_strconcat(name, GQ_COLLECTION_EXT, NULL);
                        g_free((gpointer) name);
                        name = tmp;
                        }

diff --git a/src/collect-dlg.c b/src/collect-dlg.c
index 62074ce..363bdf3 100644 (file)
--- a/src/collect-dlg.c
+++ b/src/collect-dlg.c
@@ -104,10 +104,10 @@ static void collection_save_cb(FileDialog *fd, gpointer data)
        path = fd->dest_path;
 
        /* FIXME: utf8 */
-       if (!(strlen(path) > 7 && strncasecmp(path + (strlen(path) - 4), ".gqv", 4) == 0))
+       if (!file_extension_match(path, GQ_COLLECTION_EXT))
                {
                gchar *buf;
-               buf = g_strconcat(path, ".gqv", NULL);
+               buf = g_strconcat(path, GQ_COLLECTION_EXT, NULL);
                gtk_entry_set_text(GTK_ENTRY(fd->entry), buf);
                g_free(buf);
                }
@@ -202,7 +202,7 @@ static void collection_save_or_load_dialog(const gchar *path,
 
        base = g_build_filename(homedir(), GQ_RC_DIR_COLLECTIONS, NULL);
        file_dialog_add_path_widgets(fd, base, path,
-                                    "collection_load_save", ".gqv", _("Collection Files"));
+                                    "collection_load_save", GQ_COLLECTION_EXT, _("Collection Files"));
        g_free(base);
 
        fd->type = type;

diff --git a/src/filefilter.c b/src/filefilter.c
index 66fe73b..b1c16f9 100644 (file)
--- a/src/filefilter.c
+++ b/src/filefilter.c
@@ -228,7 +228,7 @@ void filter_add_defaults(void)
 
        /* non-image files that might be desirable to show */
        filter_add_if_missing("xmp", "XMP sidecar", ".xmp", FORMAT_CLASS_META, TRUE);
-       filter_add_if_missing("gqv", GQ_APPNAME " image collection", ".gqv", FORMAT_CLASS_META, TRUE);
+       filter_add_if_missing("gqv", GQ_APPNAME " image collection", GQ_COLLECTION_EXT, FORMAT_CLASS_META, TRUE);
 
        /* These are the raw camera formats with embedded jpeg/exif.
         * (see format_raw.c and/or exiv2.cc)

diff --git a/src/image-overlay.c b/src/image-overlay.c
index 0cdab46..2f1d96f 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -438,7 +438,7 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
                n = g_list_index(cd->list, info) + 1;
                if (cd->name)
                        {
-                       if (file_extension_match(cd->name, ".gqv"))
+                       if (file_extension_match(cd->name, GQ_COLLECTION_EXT))
                                collection_name = remove_extension_from_path(cd->name);
                        else
                                collection_name = g_strdup(cd->name);

diff --git a/src/img-view.c b/src/img-view.c
index 419e6c0..861cbe0 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -939,7 +939,7 @@ void view_window_new(FileData *fd)
 {
        GList *list;
 
-       if (file_extension_match(fd->path, ".gqv"))
+       if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
                {
                ViewWindow *vw;
                CollectionData *cd;

diff --git a/src/main.c b/src/main.c
index 6c22edc..adb04cb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -180,7 +180,7 @@ static void parse_command_line_add_file(const gchar *file_path, gchar **path, gc
        path_parsed = g_strdup(file_path);
        parse_out_relatives(path_parsed);
 
-       if (file_extension_match(path_parsed, ".gqv"))
+       if (file_extension_match(path_parsed, GQ_COLLECTION_EXT))
                {
                *collection_list = g_list_append(*collection_list, path_parsed);
                }

diff --git a/src/main.h b/src/main.h
index fb95d68..c784bc2 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -80,6 +80,8 @@
 
 #define RC_FILE_NAME GQ_APPNAME_LC "rc"
 
+#define GQ_COLLECTION_EXT ".gqv"
+
 #define ZOOM_RESET_ORIGINAL 0
 #define ZOOM_RESET_FIT_WINDOW 1
 #define ZOOM_RESET_NONE 2

diff --git a/src/remote.c b/src/remote.c
index 4a9391e..717a3d0 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -477,7 +477,7 @@ static void gr_file_load(const gchar *text, gpointer data)
 
        if (isfile(filename))
                {
-               if (file_extension_match(filename, ".gqv"))
+               if (file_extension_match(filename, GQ_COLLECTION_EXT))
                        {
                        collection_window_new(filename);
                        }