Typo
[dhcpcd-ui] / menu.c
diff --git a/menu.c b/menu.c
index fd459da2740dbf361298d5d7b74f07a2b7015918..63cd2db0d588dfb4746896ca1530f865c0148d5e 100644 (file)
--- a/menu.c
+++ b/menu.c
 #include "wpa.h"
 
 static const char *copyright = "Copyright (c) 2009 Roy Marples";
 #include "wpa.h"
 
 static const char *copyright = "Copyright (c) 2009 Roy Marples";
-
 static const char *authors[] = { "Roy Marples <roy@marples.name>", NULL };
 
 static void
 on_pref(_unused GtkMenuItem *item, _unused gpointer data)
 {
 static const char *authors[] = { "Roy Marples <roy@marples.name>", NULL };
 
 static void
 on_pref(_unused GtkMenuItem *item, _unused gpointer data)
 {
-       dhcpcd_prefs();
+       dhcpcd_prefs_show();
 }
 
 
 }
 
 
@@ -215,14 +214,6 @@ on_popup(GtkStatusIcon *icon, guint button, guint32 atime, gpointer data)
            G_CALLBACK(on_pref), icon);
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
            G_CALLBACK(on_pref), icon);
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
-       item = gtk_image_menu_item_new_with_mnemonic(_("_Quit"));
-       image = gtk_image_new_from_icon_name(GTK_STOCK_QUIT,
-           GTK_ICON_SIZE_MENU);
-       gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
-       g_signal_connect(G_OBJECT(item), "activate",
-           G_CALLBACK(on_quit), icon);
-       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-
        item = gtk_separator_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
        item = gtk_separator_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
@@ -242,6 +233,14 @@ on_popup(GtkStatusIcon *icon, guint button, guint32 atime, gpointer data)
            G_CALLBACK(on_about), icon);
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
            G_CALLBACK(on_about), icon);
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
+       item = gtk_image_menu_item_new_with_mnemonic(_("_Quit"));
+       image = gtk_image_new_from_icon_name(GTK_STOCK_QUIT,
+           GTK_ICON_SIZE_MENU);
+       gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+       g_signal_connect(G_OBJECT(item), "activate",
+           G_CALLBACK(on_quit), icon);
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+
        gtk_widget_show_all(GTK_WIDGET(menu));
        gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
            gtk_status_icon_position_menu, data, button, atime);
        gtk_widget_show_all(GTK_WIDGET(menu));
        gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
            gtk_status_icon_position_menu, data, button, atime);