Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder:
  disobedience/control.c: Force internal event when buttons are frobbed.
  configure.ac: Use Automake `silent-rules' by default.
  doc/disorder_protocol.5.in: Document `sofar' field in track-info line.

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 94e3022..454a65f 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -167,7 +167,7 @@ void all_update(void);
 
 GtkWidget *menubar(GtkWidget *w);
 /* Create the menu bar */
-int full_mode;
+extern int full_mode;
 
 void users_set_sensitive(int sensitive);
 
@@ -228,7 +228,7 @@ extern const GtkTargetEntry choose_targets[];
 
 void login_box(void);
 
-GtkWidget *login_window;
+extern GtkWidget *login_window;
 
 /* User management */
 
@@ -251,7 +251,7 @@ void stop_rtp(void);
 void load_rtp_config(void);
 void save_rtp_config(void);
 void change_rtp_api(const char *api);
-const char *rtp_api;
+extern const char *rtp_api;
 int rtp_setvol(int *l, int *r);
 int rtp_getvol(int *l, int *r);