[easytag] Remove some crufty defines
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag] Remove some crufty defines
- Date: Tue, 4 Dec 2012 18:20:16 +0000 (UTC)
commit 4a88445aba5345e77d333c59255e5a0b5a732d47
Author: David King <amigadave amigadave com>
Date: Tue Dec 4 18:00:49 2012 +0000
Remove some crufty defines
src/cddb.c | 10 +++++-----
src/easytag.c | 9 +++++----
src/easytag.h | 12 ------------
3 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/src/cddb.c b/src/cddb.c
index 3e771b0..7c0e013 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -2268,7 +2268,7 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
string,
(tmp=Cddb_Generate_Request_String_With_Fields_And_Categories_Options()),
cddb_server_name,cddb_server_port,
- APPNAME,PACKAGE_VERSION,
+ PACKAGE_NAME, PACKAGE_VERSION,
(proxy_auth=Cddb_Format_Proxy_Authentification())
);
@@ -2590,7 +2590,7 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
string,
next_page_cpt,
cddb_server_name,cddb_server_port,
- APPNAME,PACKAGE_VERSION,
+ PACKAGE_NAME, PACKAGE_VERSION,
(proxy_auth=Cddb_Format_Proxy_Authentification())
);
next_page_found = FALSE;
@@ -3151,7 +3151,7 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
cddb_discid,
num_tracks, query_string,
disc_length,
- APPNAME,PACKAGE_VERSION,
+ PACKAGE_NAME, PACKAGE_VERSION,
cddb_server_name,cddb_server_port,
(proxy_auth=Cddb_Format_Proxy_Authentification())
);
@@ -3435,7 +3435,7 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
CDDB_USE_PROXY?"http://":"", CDDB_USE_PROXY?cddb_server_name:"", // Needed when using proxy
cddbalbum->category,cddbalbum->id,
cddb_server_name,cddb_server_port,
- APPNAME,PACKAGE_VERSION,
+ PACKAGE_NAME, PACKAGE_VERSION,
(proxy_auth=Cddb_Format_Proxy_Authentification())
);
}else
@@ -3452,7 +3452,7 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
"Connection: close\r\n\r\n",
CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
cddbalbum->category,cddbalbum->id,
- APPNAME,PACKAGE_VERSION,
+ PACKAGE_NAME, PACKAGE_VERSION,
cddb_server_name,cddb_server_port,
(proxy_auth=Cddb_Format_Proxy_Authentification())
);
diff --git a/src/easytag.c b/src/easytag.c
index 5a553fe..7bb92fb 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -247,9 +247,9 @@ int main (int argc, char *argv[])
{
if ( (strcmp(argv[1],"--version")==0) || (strcmp(argv[1],"-v")==0) ) // Query version
{
- g_print(_("%s %s by %s (compiled %s, %s)\n"),APPNAME,PACKAGE_VERSION,AUTHOR,__TIME__,__DATE__);
- g_print(_("Email: %s"),EMAIL"\n");
- g_print(_("Web Page: %s"),PACKAGE_URL"\n");
+ g_print (_("%s %s (compiled %s, %s)\n"), PACKAGE_NAME,
+ PACKAGE_VERSION, __TIME__, __DATE__);
+ g_print (_("Website: %s"), PACKAGE_URL"\n");
exit (0);
}else if ( (strcmp(argv[1],"--help")==0) || (strcmp(argv[1],"-h")==0) ) // Query help
{
@@ -346,7 +346,8 @@ int main (int argc, char *argv[])
/* The main window */
MainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(MainWindow),APPNAME" "PACKAGE_VERSION);
+ gtk_window_set_title (GTK_WINDOW (MainWindow),
+ PACKAGE_NAME " " PACKAGE_VERSION);
// This part is needed to set correctly the position of handle panes
gtk_window_set_default_size(GTK_WINDOW(MainWindow),MAIN_WINDOW_WIDTH,MAIN_WINDOW_HEIGHT);
diff --git a/src/easytag.h b/src/easytag.h
index 4ab0ac8..e333abf 100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -29,20 +29,8 @@
#include "et_core.h"
-#define APPNAME "EasyTAG"
-#define AUTHOR "Jerome Couderc" // Note: do not use accents
-#define EMAIL "easytag-mailing lists sourceforge net"
-#define WEBPAGE "http://easytag.sourceforge.net"
-/*#define VERSION "0.15.1" //Now version is defined in ../configure.h.in */
-
#define MAX_STRING_LEN 1024
-#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define ATTRIBUTE_UNUSED __attribute__((__unused__))
-#else
-# define ATTRIBUTE_UNUSED
-#endif
-
/***************
* Declaration *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]