--- thunar-svn-plugin/tsp-svn-helper/tsh-common.c +++ thunar-svn-plugin/tsp-svn-helper/tsh-common.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "tsh-dialog-common.h" #include "tsh-login-dialog.h" @@ -476,10 +477,24 @@ N_("Replaced"), N_("Transmitting"), ("Revision"), +// new in 1.2 +#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 2 N_("Locked"), N_("Unlocked"), N_("Lock failed"), - N_("Unlock failed") + N_("Unlock failed"), +#endif +// new in 1.5 +#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 5 + N_("Path already added"), + N_("Changelist name set"), + N_("Changelist name cleared"), + N_("Changelist moved"), + N_("Merge begun"), + N_("Foreign merge begun"), + N_("Replaced"), +#endif + "" }; const gchar *action_string = N_("Unknown"); @@ -507,10 +522,23 @@ case svn_wc_notify_commit_replaced: case svn_wc_notify_commit_postfix_txdelta: case svn_wc_notify_blame_revision: +// new in 1.2 +#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 2 case svn_wc_notify_locked: case svn_wc_notify_unlocked: case svn_wc_notify_failed_lock: case svn_wc_notify_failed_unlock: +#endif +// new in 1.5 +#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 5 + case svn_wc_notify_exists: + case svn_wc_notify_changelist_set: + case svn_wc_notify_changelist_clear: + case svn_wc_notify_changelist_moved: + case svn_wc_notify_merge_begin: + case svn_wc_notify_foreign_merge_begin: + case svn_wc_notify_update_replace: +#endif action_string = action_table[action]; break; } @@ -545,6 +573,8 @@ case svn_wc_notify_state_conflicted: state_string = state_table[state]; break; + default: + break; } return _(state_string); }