r19279 - gnucash/trunk - Improve name consistency. Use "GnuCash" (or more precisely PACKAGE_NAME), wherever the name is visible to the user, and "gnucash" (or more precisely PACKAGE) everywhere else.
Geert Janssens
gjanssens at code.gnucash.org
Sat Jun 19 11:42:33 EDT 2010
Author: gjanssens
Date: 2010-06-19 11:42:32 -0400 (Sat, 19 Jun 2010)
New Revision: 19279
Trac: http://svn.gnucash.org/trac/changeset/19279
Modified:
gnucash/trunk/packaging/win32/gnucash.iss.in
gnucash/trunk/packaging/win32/install-impl.sh
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/bin/gnucash-bin.c
gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
Log:
Improve name consistency. Use "GnuCash" (or more precisely PACKAGE_NAME), wherever the name is visible to the user, and "gnucash" (or more precisely PACKAGE) everywhere else.
Modified: gnucash/trunk/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/trunk/packaging/win32/gnucash.iss.in 2010-06-19 14:50:55 UTC (rev 19278)
+++ gnucash/trunk/packaging/win32/gnucash.iss.in 2010-06-19 15:42:32 UTC (rev 19279)
@@ -41,25 +41,25 @@
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\GnuCash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\GnuCash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
[UninstallRun]
Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\GnuCash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -113,7 +113,7 @@
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\GnuCash.exe"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2010-06-19 14:50:55 UTC (rev 19278)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2010-06-19 15:42:32 UTC (rev 19279)
@@ -1434,7 +1434,7 @@
set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
-start GnuCash %*
+start gnucash %*
EOF
qpopd
fi
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2010-06-19 14:50:55 UTC (rev 19278)
+++ gnucash/trunk/src/bin/Makefile.am 2010-06-19 15:42:32 UTC (rev 19279)
@@ -26,9 +26,7 @@
# Some settings are platform dependent. Let's define them per platform.
if PLATFORM_WIN32
# Windows specific settings go here:
-BIN_NAME = GnuCash
-GnuCash_SOURCES = ${gnucash_SOURCES}
-GnuCash_LDADD = ${gnucash_LDADD}
+BIN_NAME = gnucash
GNUCASH_RESOURCE_FILE = gnucash.rc
dist_noinst_DATA = gnucash.rc
Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c 2010-06-19 14:50:55 UTC (rev 19278)
+++ gnucash/trunk/src/bin/gnucash-bin.c 2010-06-19 15:42:32 UTC (rev 19279)
@@ -252,7 +252,7 @@
#ifdef MAC_INTEGRATION
static void
-set_mac_locale()
+set_mac_locale()
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSUserDefaults *defs = [NSUserDefaults standardUserDefaults];
@@ -278,7 +278,7 @@
NSString *money_locale = nil;
while (this_locale = (NSString*)[locale_iter nextObject])
if ([[[[NSLocale alloc] initWithLocaleIdentifier: this_locale]
- objectForKey: NSLocaleCurrencyCode]
+ objectForKey: NSLocaleCurrencyCode]
isEqualToString: currency]) {
money_locale = this_locale;
break;
@@ -304,7 +304,7 @@
* traditional Chinese (zh-Hant), which are normally assigned the
* locales zh_CN and zh_TW, respectively. Those are handled
* specially.*/
- if ([languages count] > 0 &&
+ if ([languages count] > 0 &&
!([[languages objectAtIndex: 0] isEqualToString: @"en"] ||
[[languages objectAtIndex: 0] isEqualToString: @"\"en-US\""])) {
NSEnumerator *lang_iter = [languages objectEnumerator];
@@ -853,7 +853,7 @@
/* This option needs to run without a display, so we can't
initialize any GUI libraries. */
gnome_program_init(
- "gnucash", VERSION, LIBGNOME_MODULE,
+ PACKAGE, VERSION, LIBGNOME_MODULE,
argc, argv,
GNOME_PARAM_APP_PREFIX, prefix,
GNOME_PARAM_APP_SYSCONFDIR, pkgsysconfdir,
Modified: gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c 2010-06-19 14:50:55 UTC (rev 19278)
+++ gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c 2010-06-19 15:42:32 UTC (rev 19279)
@@ -593,7 +593,7 @@
return main_window;
}
- g_set_application_name("GnuCash");
+ g_set_application_name(PACKAGE_NAME);
if (gnc_gconf_get_bool(GCONF_GENERAL, "show_splash_screen", NULL))
gnc_gui_init_splash();
More information about the gnucash-changes
mailing list