Build fixes for GCC 4.1

[disorder] / disobedience / menu.c

diff --git a/disobedience/menu.c b/disobedience/menu.c
index abe7005..73773dd 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -165,7 +165,7 @@ static void manual_popup(gpointer attribute((unused)) callback_data,
 
 /** @brief Called when version arrives, displays about... popup */
 static void about_popup_got_version(void attribute((unused)) *v,
-                                    const char attribute((unused)) *error,
+                                    const char attribute((unused)) *err,
                                     const char *value) {
   GtkWidget *w;
   char *server_version_string;
@@ -300,7 +300,7 @@ GtkWidget *menubar(GtkWidget *w) {
     },
     {
       (char *)"/Edit/Select all tracks", /* path */
-      (char *)"<CTRL>A",                /* accelerator */
+      0,                                /* accelerator */
       select_all,                       /* callback */
       0,                                /* callback_action */
       0,                                /* item_type */
@@ -308,7 +308,7 @@ GtkWidget *menubar(GtkWidget *w) {
     },
     {
       (char *)"/Edit/Deselect all tracks", /* path */
-      (char *)"<CTRL><SHIFT>A",         /* accelerator */
+      0,                                /* accelerator */
       select_none,                      /* callback */
       0,                                /* callback_action */
       0,                                /* item_type */
@@ -414,8 +414,6 @@ GtkWidget *menubar(GtkWidget *w) {
   
   GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                        "<GdisorderMain>/Edit");
-  fprintf(stderr, "edit is a %s\n",
-          GTK_OBJECT_TYPE_NAME(edit_widget));
   g_signal_connect(edit_widget, "show", G_CALLBACK(edit_menu_show), 0);
   
   event_register("rights-changed", menu_rights_changed, 0);