diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2009-02-27 19:44:45 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2009-02-27 19:44:45 +0100 |
| commit | 2eda46ed24d5c22dd895d3eebd8af931be4fefdc (patch) | |
| tree | 0b6752f5664e94a42a95e191db02f9de4e9a1663 /src | |
| parent | a60968deda3e541b84535616944cd2165c51a568 (diff) | |
| download | cataract-2eda46ed24d5c22dd895d3eebd8af931be4fefdc.tar.xz | |
Merge cgg-config.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/cgg-config.h | 30 | ||||
| -rw-r--r-- | src/cgg.c | 3 | ||||
| -rw-r--r-- | src/generators.c | 1 | ||||
| -rw-r--r-- | src/setup.c | 1 | ||||
| -rw-r--r-- | src/setup.h | 10 |
6 files changed, 11 insertions, 35 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 443d2f1..f8b46c9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,6 @@ bin_SCRIPTS = \ cgg_SOURCES = \ cgg.c \ - cgg-config.h \ gallery-utils.c \ gallery-utils.h \ generators.c \ diff --git a/src/cgg-config.h b/src/cgg-config.h deleted file mode 100644 index 7a447d7..0000000 --- a/src/cgg-config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Cataract - Static web photo gallery generator - * Copyright (C) 2008 Tomas Bzatek <tbzatek@users.sourceforge.net> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - - -/* Directory names of smaller images */ -#define THUMBNAIL_DIR "_thumb" -#define IMG_BIG_DIR "_big" -#define IMG_ORIG_DIR "_orig" - -#define SETUP_XML "setup.xml" - -// #define APP_VERSION "0.99.0" -// #define APP_BUILD_DATE "2008-07-27" - @@ -27,7 +27,6 @@ #include <config.h> -#include "cgg-config.h" #include "setup.h" #include "generators.h" @@ -61,7 +60,7 @@ parse_cmd (int argc, char* argv[], char **source_dir, char **dst_dir, gboolean * g_set_prgname ("cgg"); context = g_option_context_new ("- web gallery generator"); - s1 = g_strdup_printf ("cgg v%s [%s] Copyright (c) %s Tomas Bzatek", VERSION, APP_BUILD_DATE, APP_COPYRIGHT_DATE); + s1 = g_strdup_printf ("cgg v%s [%s] %s", VERSION, APP_BUILD_DATE, APP_COPYRIGHT_STRING); g_option_context_set_summary (context, s1); g_free (s1); g_option_context_add_main_entries (context, entries, NULL); diff --git a/src/generators.c b/src/generators.c index a8151c1..f311388 100644 --- a/src/generators.c +++ b/src/generators.c @@ -26,7 +26,6 @@ #include <config.h> -#include "cgg-config.h" #include "setup.h" #include "items.h" #include "jpeg-utils.h" diff --git a/src/setup.c b/src/setup.c index aafd218..2e19acf 100644 --- a/src/setup.c +++ b/src/setup.c @@ -30,7 +30,6 @@ #include <config.h> -#include "cgg-config.h" #include "gallery-utils.h" #include "setup.h" #include "xml-parser.h" diff --git a/src/setup.h b/src/setup.h index eea4b17..111e9b1 100644 --- a/src/setup.h +++ b/src/setup.h @@ -22,6 +22,16 @@ #include <glib.h> +/* Directory names */ +#define THUMBNAIL_DIR "_thumb" +#define IMG_BIG_DIR "_big" +#define IMG_ORIG_DIR "_orig" + +#define SETUP_XML "setup.xml" + + + +/* Global gallery setup */ typedef struct { gboolean verbose; char *real_templates_dir; |