The branch, master has been updated
via 68e370574af6fc8f453a0bf9577adcfdfad9ab62 (commit)
from 544c80d71534adc8f2d3843d06b01655dc02f1a9 (commit)
- Log -----------------------------------------------------------------
commit 68e370574af6fc8f453a0bf9577adcfdfad9ab62
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Fix constness of window_choose_add_item and _window.
---
tmux.h | 4 ++--
window-choose.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tmux.h b/tmux.h
index 2b4a68b..69723d5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2204,13 +2204,13 @@ void window_choose_data_free(struct
window_choose_data *);
void window_choose_data_run(struct window_choose_data *);
struct window_choose_data *window_choose_add_window(struct window_pane *,
struct client *, struct session *, struct winlink *,
- const char *, char *, u_int);
+ const char *, const char *, u_int);
struct window_choose_data *window_choose_add_session(struct window_pane *,
struct client *, struct session *, const char *,
const char *, u_int);
struct window_choose_data *window_choose_add_item(struct window_pane *,
struct client *, struct winlink *, const char *,
- char *, u_int);
+ const char *, u_int);
void window_choose_expand_all(struct window_pane *);
/* names.c */
diff --git a/window-choose.c b/window-choose.c
index 0d386fd..5b11f4b 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -887,7 +887,7 @@ window_choose_add_session(struct window_pane *wp, struct
client *c,
struct window_choose_data *
window_choose_add_item(struct window_pane *wp, struct client *c,
- struct winlink *wl, const char *template, char *action, u_int idx)
+ struct winlink *wl, const char *template, const char *action, u_int idx)
{
struct window_choose_data *wcd;
char *expanded;
@@ -918,7 +918,7 @@ window_choose_add_item(struct window_pane *wp, struct
client *c,
struct window_choose_data *
window_choose_add_window(struct window_pane *wp, struct client *c,
struct session *s, struct winlink *wl, const char *template,
- char *action, u_int idx)
+ const char *action, u_int idx)
{
struct window_choose_data *wcd;
char *expanded;
-----------------------------------------------------------------------
Summary of changes:
tmux.h | 4 ++--
window-choose.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
