diff options
author | Christian Grothoff <christian@grothoff.org> | 2007-03-01 07:04:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2007-03-01 07:04:03 +0000 |
commit | f1b055e62acfa44ca52eb74c81abbac00328aa40 (patch) | |
tree | d01f6f5d8ffdf191298ea67996bcd8efc0e00e33 | |
parent | 7e5e13203bbc9b910e4d6bed91a5c820f54b8f76 (diff) | |
download | gnunet-gtk-f1b055e62acfa44ca52eb74c81abbac00328aa40.tar.gz gnunet-gtk-f1b055e62acfa44ca52eb74c81abbac00328aa40.zip |
fixing gettext issues
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | src/common/helper.c | 2 | ||||
-rw-r--r-- | src/core/main.c | 8 |
4 files changed, 12 insertions, 13 deletions
@@ -1,3 +1,6 @@ | |||
1 | Thu Mar 1 00:03:44 MST 2007 | ||
2 | Fixing issues with gettext (wrong path). | ||
3 | |||
1 | Sat Feb 24 15:43:14 MST 2007 | 4 | Sat Feb 24 15:43:14 MST 2007 |
2 | Improved performance of statistics querying code | 5 | Improved performance of statistics querying code |
3 | (O(n^2) to O(n) where n is number of stats). | 6 | (O(n^2) to O(n) where n is number of stats). |
diff --git a/configure.ac b/configure.ac index afe05efb..9a717b4e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -317,17 +317,7 @@ if test x$have_libgksu2 = xyes ; then | |||
317 | fi | 317 | fi |
318 | 318 | ||
319 | 319 | ||
320 | 320 | AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-only architecture-independent data]) | |
321 | |||
322 | |||
323 | |||
324 | |||
325 | # We define the paths here, because MinGW/GCC expands paths | ||
326 | # passed through the command line ("-DDATADIR=..."). This would | ||
327 | # lead to hard-coded paths ("C:\mingw\mingw\bin...") that do | ||
328 | # not contain the actual installation. | ||
329 | AC_DEFINE_DIR([PACKAGE_DATA_DIR], [rootdatadir/gnunet-gtk], [The directory for installing read-only architecture-independent data]) | ||
330 | AC_DEFINE_DIR([PACKAGE_LOCALE_DIR], [rootdatadir/locale], [gettext catalogs]) | ||
331 | 321 | ||
332 | 322 | ||
333 | # Set PACKAGE_SOURCE_DIR in config.h. | 323 | # Set PACKAGE_SOURCE_DIR in config.h. |
diff --git a/src/common/helper.c b/src/common/helper.c index ad4f3e71..bb268ce8 100644 --- a/src/common/helper.c +++ b/src/common/helper.c | |||
@@ -471,7 +471,7 @@ void gnunetgtk_notify(int type, | |||
471 | va_end(arg); | 471 | va_end(arg); |
472 | libnotify = notify_notification_new("gnunet-gtk", | 472 | libnotify = notify_notification_new("gnunet-gtk", |
473 | msg, | 473 | msg, |
474 | PACKAGE_DATA_DIR"/gnunet-gtk-notify.png", | 474 | PACKAGE_DATA "/gnunet-gtk/gnunet-gtk-notify.png", |
475 | NULL); | 475 | NULL); |
476 | FREE(msg); | 476 | FREE(msg); |
477 | notify_notification_set_timeout(libnotify, libnotify_expire_timeout); | 477 | notify_notification_set_timeout(libnotify, libnotify_expire_timeout); |
diff --git a/src/core/main.c b/src/core/main.c index fc762980..aa1c0938 100644 --- a/src/core/main.c +++ b/src/core/main.c | |||
@@ -78,6 +78,9 @@ int main(int argc, | |||
78 | int i; | 78 | int i; |
79 | struct GE_Context * ectx; | 79 | struct GE_Context * ectx; |
80 | struct GC_Configuration * cfg; | 80 | struct GC_Configuration * cfg; |
81 | #if ENABLE_NLS | ||
82 | char * path; | ||
83 | #endif | ||
81 | 84 | ||
82 | #ifdef WINDOWS | 85 | #ifdef WINDOWS |
83 | SetCursor(LoadCursor(NULL, IDC_APPSTARTING)); | 86 | SetCursor(LoadCursor(NULL, IDC_APPSTARTING)); |
@@ -102,7 +105,10 @@ int main(int argc, | |||
102 | #endif | 105 | #endif |
103 | 106 | ||
104 | #if ENABLE_NLS | 107 | #if ENABLE_NLS |
105 | BINDTEXTDOMAIN("gnunet-gtk", PACKAGE_LOCALE_DIR); | 108 | setlocale (LC_ALL, ""); |
109 | path = os_get_installation_path(IPK_LOCALEDIR); | ||
110 | BINDTEXTDOMAIN("gnunet-gtk", path); | ||
111 | FREE(path); | ||
106 | textdomain("gnunet-gtk"); | 112 | textdomain("gnunet-gtk"); |
107 | bind_textdomain_codeset("GNUnet", "UTF-8"); | 113 | bind_textdomain_codeset("GNUnet", "UTF-8"); |
108 | bind_textdomain_codeset("gnunet-gtk", "UTF-8"); | 114 | bind_textdomain_codeset("gnunet-gtk", "UTF-8"); |