1 files changed, 7 insertions, 11 deletions

diff --git a/projects/gvpndialer/trunk/src/interface.c b/projects/gvpndialer/trunk/src/interface.c
index 64a6857..d019af9 100644
--- a/projects/gvpndialer/trunk/src/interface.c
+++ b/projects/gvpndialer/trunk/src/interface.c
@@ -41,7 +41,7 @@ static GnomeUIInfo edit1_menu_uiinfo[] =
 static GnomeUIInfo view1_menu_uiinfo[] =
 {
   {
-    GNOME_APP_UI_ITEM, "_Status",
+    GNOME_APP_UI_ITEM, "Status",
     NULL,
     (gpointer) on_status2_activate, NULL, NULL,
     GNOME_APP_PIXMAP_FILENAME, "gvpndialer/Status-Dock.png",
@@ -114,18 +114,14 @@ create_vpnclient_main_window (void)
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_BOTH);
   tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1));
 
-  tmp_image = create_pixmap (vpnclient_main_window, "gvpndialer/stock_exec_24.png");
-  gtk_widget_show (tmp_image);
-  execute_vpn_button = (GtkWidget*) gtk_tool_button_new (tmp_image, "Connect");
+  execute_vpn_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-connect");
   gtk_widget_show (execute_vpn_button);
   gtk_container_add (GTK_CONTAINER (toolbar1), execute_vpn_button);
   gtk_widget_set_size_request (execute_vpn_button, 82, 65);
   gtk_container_set_border_width (GTK_CONTAINER (execute_vpn_button), 7);
   gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (execute_vpn_button), tooltips, "Start VPN Connection", NULL);
 
-  tmp_image = create_pixmap (vpnclient_main_window, "gvpndialer/stock_stop_24.png");
-  gtk_widget_show (tmp_image);
-  disconnect_button = (GtkWidget*) gtk_tool_button_new (tmp_image, "Disconnect");
+  disconnect_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-disconnect");
   gtk_widget_show (disconnect_button);
   gtk_container_add (GTK_CONTAINER (toolbar1), disconnect_button);
   gtk_widget_set_size_request (disconnect_button, 99, 61);
@@ -136,9 +132,8 @@ create_vpnclient_main_window (void)
   gtk_widget_show (separatortoolitem1);
   gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem1);
 
-  tmp_image = create_pixmap (vpnclient_main_window, "gvpndialer/Status-Dock.png");
-  gtk_widget_show (tmp_image);
-  status_button = (GtkWidget*) gtk_tool_button_new (tmp_image, "_Status");
+  status_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-info");
+  gtk_tool_button_set_label (status_button, "Status");
   gtk_widget_show (status_button);
   gtk_container_add (GTK_CONTAINER (toolbar1), status_button);
   gtk_container_set_border_width (GTK_CONTAINER (status_button), 7);
@@ -576,12 +571,13 @@ create_status_window (void)
   gtk_window_set_title (GTK_WINDOW (status_window), "Status Window");
   gtk_window_set_default_size (GTK_WINDOW (status_window), 433, 431);
   gtk_window_set_resizable (GTK_WINDOW (status_window), FALSE);
-  status_window_icon_pixbuf = create_pixbuf ("gvpndialer/Status-Dock.png");
+/*  status_window_icon_pixbuf = create_pixbuf ("gvpndialer/Status-Dock.png");
   if (status_window_icon_pixbuf)
     {
       gtk_window_set_icon (GTK_WINDOW (status_window), status_window_icon_pixbuf);
       gdk_pixbuf_unref (status_window_icon_pixbuf);
     }
+*/
 
   notebook2 = gtk_notebook_new ();
   gtk_widget_show (notebook2);