chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue29'
[disorder]
/
disobedience
/
menu.c
diff --git
a/disobedience/menu.c
b/disobedience/menu.c
index bae0f00d7f0471c018efd2816afbef91af59f79b..435aeb4175d252a158da46696000db17b8a2f84d 100644
(file)
--- a/
disobedience/menu.c
+++ b/
disobedience/menu.c
@@
-182,7
+182,7
@@
static void about_popup_got_version(void attribute((unused)) *v,
FALSE/*fill*/,
1/*padding*/);
gtk_box_pack_start(GTK_BOX(vbox),
FALSE/*fill*/,
1/*padding*/);
gtk_box_pack_start(GTK_BOX(vbox),
- gtk_label_new("\xC2\xA9 200
4-2009 Richard Kettlewel
l"),
+ gtk_label_new("\xC2\xA9 200
3-2011 Richard Kettlewell et a
l"),
FALSE/*expand*/,
FALSE/*fill*/,
1/*padding*/);
FALSE/*expand*/,
FALSE/*fill*/,
1/*padding*/);
@@
-360,6
+360,14
@@
GtkWidget *menubar(GtkWidget *w) {
(char *)"<CheckItem>", /* item_type */
0 /* extra_data */
},
(char *)"<CheckItem>", /* item_type */
0 /* extra_data */
},
+ {
+ (char *)"/Control/Global Preferences", /* path */
+ (char *)"<CTRL>G", /* accelerator */
+ popup_globals, /* callback */
+ 0, /* callback_action */
+ 0, /* item_type */
+ 0 /* extra_data */
+ },
{
(char *)"/Control/Activate playlist", /* path */
0, /* accelerator */
{
(char *)"/Control/Activate playlist", /* path */
0, /* accelerator */