From 543326fe9bde68ed0e0512d4318ff16e15e28690 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 29 Aug 2005 17:55:38 +0000 Subject: [PATCH] 2005-08-29 Christopher Aillon * gnome/applet/applet.c: Draw VPN connections as radio items since we don't yet support multiple VPNs. * gnome/applet/other-network-dialog.c: Use stock icon for Connect * gnome/vpn-properties/nm-vpn-properties.c: Use stock icon for Delete git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@906 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ gnome/applet/applet.c | 3 +++ gnome/applet/other-network-dialog.c | 6 ++++++ gnome/vpn-properties/nm-vpn-properties.c | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eedd635224..6858f7ea85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-29 Christopher Aillon + + * gnome/applet/applet.c: Draw VPN connections as radio items + since we don't yet support multiple VPNs. + * gnome/applet/other-network-dialog.c: Use stock icon for Connect + * gnome/vpn-properties/nm-vpn-properties.c: Use stock icon for Delete + 2005-08-29 Dan Williams Patch from j@bootlab.org diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index c615392b29..656b542d22 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -1698,6 +1698,9 @@ static void nmwa_menu_add_vpn_menu (GtkWidget *menu, NMWirelessApplet *applet) const char *vpn_name = nmwa_vpn_connection_get_name (vpn); vpn_item = GTK_CHECK_MENU_ITEM (gtk_check_menu_item_new_with_label (vpn_name)); + /* temporarily do this until we support multiple VPN connections */ + gtk_check_menu_item_set_draw_as_radio (vpn_item, TRUE); + nmwa_vpn_connection_ref (vpn); g_object_set_data (G_OBJECT (vpn_item), "vpn", vpn); diff --git a/gnome/applet/other-network-dialog.c b/gnome/applet/other-network-dialog.c index 2967514774..8ef0e8f933 100644 --- a/gnome/applet/other-network-dialog.c +++ b/gnome/applet/other-network-dialog.c @@ -213,6 +213,12 @@ static GtkDialog *nmwa_other_network_dialog_init (GladeXML *xml, NMWirelessApple essid_entry = glade_xml_get_widget (xml, "essid_entry"); button = glade_xml_get_widget (xml, "ok_button"); gtk_widget_grab_default (GTK_WIDGET (button)); +#if GTK_CHECK_VERSION(2,6,0) + { + GtkWidget *connect_image = gtk_image_new_from_stock (GTK_STOCK_CONNECT, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), connect_image); + } +#endif gtk_widget_grab_focus (essid_entry); gtk_widget_set_sensitive (button, FALSE); diff --git a/gnome/vpn-properties/nm-vpn-properties.c b/gnome/vpn-properties/nm-vpn-properties.c index a105ee8abd..c37b012020 100644 --- a/gnome/vpn-properties/nm-vpn-properties.c +++ b/gnome/vpn-properties/nm-vpn-properties.c @@ -733,7 +733,7 @@ delete_cb (GtkButton *button, gpointer user_data) GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, _("Delete VPN connection \"%s\"?"), conn_name); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), "_Delete", GTK_RESPONSE_OK, NULL); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_OK, NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("All information about the VPN connection \"%s\" will be lost and you may need your system administrator to provide information to create a new connection."), conn_name); response = gtk_dialog_run (GTK_DIALOG (dialog));