Updating branch refs/heads/master to 4331a369bea25840216c1dea26786077697fc4bd (commit) from ff3d8b861461414efc3ce272ac567e7059830e97 (commit)
commit 4331a369bea25840216c1dea26786077697fc4bd Author: Peter de Ridder <pe...@xfce.org> Date: Tue Sep 29 23:36:56 2009 +0200 * tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init translations. * tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty string before translations, otherwise the po header will be returned. * */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS overriding. ChangeLog | 18 ++++++++++-------- thunar-vcs-plugin/Makefile.am | 20 +++++++++++++------- tvp-git-helper/Makefile.am | 3 ++- tvp-git-helper/main.c | 3 +++ tvp-svn-helper/Makefile.am | 3 ++- tvp-svn-helper/main.c | 3 +++ tvp-svn-helper/tsh-common.c | 4 +++- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 615a8a5..5751442 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17 +1,22 @@ 2009-09-27 Peter de Ridder <pe...@xfce.org> - * Made Thuner VCS Plugin compile with --enable-debug=full. - * Updated the po files. + + * tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init + translations. + * tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty + string before translations, otherwise the po header will be + returned. + * */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS + overriding. 2009-09-27 Peter de Ridder <pe...@xfce.org> + * Made Thuner VCS Plugin compile with --enable-debug=full. + * Updated the po files. * autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of xfce4-dev-tools, now. * tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for directory deletion. - -2009-08-27 Peter de Ridder <pe...@xfce.org> - * tvp-svn-helper/tsh-commit.c tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector. Using recursion info in file selection and commit command to be able @@ -20,9 +25,6 @@ flag. * tvp-svn-helper/tsh-revert.c: Added TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag. - -2009-07-27 Peter de Ridder <pe...@xfce.org> - * tvp-svn-helper/tsh-delete.c(delete_thread): Fixed segfault. * tvp-svn-helper/tsh-file-selection-dialog.[ch]: Support for unversioned directory trees. diff --git a/thunar-vcs-plugin/Makefile.am b/thunar-vcs-plugin/Makefile.am index a2a396f..e09ef29 100644 --- a/thunar-vcs-plugin/Makefile.am +++ b/thunar-vcs-plugin/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"thunar-vcs-plugin\" \ @@ -31,18 +31,24 @@ thunar_vcs_plugin_la_SOURCES += \ tvp-git-action.h endif +thunar_vcs_plugin_la_CPPFLAGS = \ + $(AM_CPPFLAGS) +if HAVE_SUBVERSION +thunar_vcs_plugin_la_CPPFLAGS += \ + -DTVP_SVN_HELPER=\"$(libexecdir)/tvp-svn-helper\" +endif +if HAVE_GIT +thunar_vcs_plugin_la_CPPFLAGS += \ + -DTVP_GIT_HELPER=\"$(libexecdir)/tvp-git-helper\" +endif + thunar_vcs_plugin_la_CFLAGS = \ $(PLATFORM_CFLAGS) \ $(THUNARX_CFLAGS) \ $(THUNAR_VFS_CFLAGS) if HAVE_SUBVERSION thunar_vcs_plugin_la_CFLAGS += \ - $(APR_CFLAGS) \ - -DTVP_SVN_HELPER=\"$(libexecdir)/tvp-svn-helper\" -endif -if HAVE_GIT -thunar_vcs_plugin_la_CFLAGS += \ - -DTVP_GIT_HELPER=\"$(libexecdir)/tvp-git-helper\" + $(APR_CFLAGS) endif thunar_vcs_plugin_la_LDFLAGS = \ diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am index e275391..ee231f3 100644 --- a/tvp-git-helper/Makefile.am +++ b/tvp-git-helper/Makefile.am @@ -36,7 +36,8 @@ tvp_git_helper_SOURCES = \ tgh-status-dialog.c tvp_git_helper_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"tvp-git-helper\" + -DG_LOG_DOMAIN=\"tvp-git-helper\" \ + $(AM_CPPFLAGS) tvp_git_helper_CFLAGS = \ $(PLATFORM_CFLAGS) \ diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c index 2b331b4..a5d083a 100644 --- a/tvp-git-helper/main.c +++ b/tvp-git-helper/main.c @@ -92,6 +92,9 @@ int main (int argc, char *argv[]) { NULL, '\0', 0, 0, NULL, NULL, NULL } }; + /* setup translation domain */ + xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + option_context = g_option_context_new("<action> [options] [args]"); g_option_context_add_main_entries(option_context, general_options_table, GETTEXT_PACKAGE); diff --git a/tvp-svn-helper/Makefile.am b/tvp-svn-helper/Makefile.am index db4c9fa..c25e5ce 100644 --- a/tvp-svn-helper/Makefile.am +++ b/tvp-svn-helper/Makefile.am @@ -88,7 +88,8 @@ tvp_svn_helper_SOURCES = \ tsh-trust-dialog.c tvp_svn_helper_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"tvp-svn-helper\" + -DG_LOG_DOMAIN=\"tvp-svn-helper\" \ + $(AM_CPPFLAGS) tvp_svn_helper_CFLAGS = \ $(PLATFORM_CFLAGS) \ diff --git a/tvp-svn-helper/main.c b/tvp-svn-helper/main.c index 7083b25..a10864b 100644 --- a/tvp-svn-helper/main.c +++ b/tvp-svn-helper/main.c @@ -233,6 +233,9 @@ int main (int argc, char *argv[]) { NULL, '\0', 0, 0, NULL, NULL, NULL } }; + /* setup translation domain */ + xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + if (!g_thread_supported ()) g_thread_init (NULL); gdk_threads_init (); diff --git a/tvp-svn-helper/tsh-common.c b/tvp-svn-helper/tsh-common.c index 13329f4..0918555 100644 --- a/tvp-svn-helper/tsh-common.c +++ b/tvp-svn-helper/tsh-common.c @@ -684,7 +684,9 @@ tsh_status_to_string(enum svn_wc_status_kind status) status_string = status_table[status]; break; } - return _(status_string); + + /* Check for None and Unversioned empty strings */ + return status_string[0]?_(status_string):""; } static const gchar * _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits