diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index b25d509e38..1bb28da414 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,12 @@ +2007-04-02 Dan Williams + + Patch from Christian Persch + * properties/nm-vpnc-dialog.glade + - HIGify (gnome.org #423753) + + * src/nm-vpnc.c + - Remove unused expander code too + 2007-02-23 Dan Williams Patch from Olaf Telshörner diff --git a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade index 959ca47c0e..a08ae43eb8 100644 --- a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade +++ b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade @@ -23,7 +23,7 @@ True False - 6 + 18 @@ -57,24 +57,25 @@ 6 - + True False - 6 + 12 True - <b>Connection Name</b> - False - True + Connection na_me: + True + False GTK_JUSTIFY_LEFT False False 0 0.5 - 3 + 0 0 + vpnc-connection-name PANGO_ELLIPSIZE_NONE -1 False @@ -83,66 +84,21 @@ 0 False - True + False - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 6 - 0 - - - - True - False - 6 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 6 - - - - True - Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" - True - True - True - 0 - - True - False - - Connection Name - Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" - - - - - - 0 - False - False - - - - + Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" + True + True + True + 0 + + True + False 0 @@ -151,35 +107,10 @@ - - 0 - True - True - - - - - - True - <b>Connection Information</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 3 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False - False + True @@ -194,34 +125,290 @@ False - + + 12 + True + 2 + 2 + False + 6 + 12 + + + + True + _Gateway: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + vpnc-gateway + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + fill + + + + + + True + True + True + True + 0 + + True + False + + + 1 + 2 + 0 + 1 + fill + + + + + + True + G_roup name: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + vpnc-group-name + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + True + True + True + 0 + + True + False + + + 1 + 2 + 1 + 2 + fill + + + + + False + True + + + + + + True + Required + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + 12 True False 6 - + + True + True + Override _user name + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + True + + + + + True 0.5 0.5 1 1 - 3 + 0 0 12 - 3 + 0 - + + True + True + True + True + 0 + + True + False + + + + + 0 + False + True + + + + + + True + True + Use _domain for authentication + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + True + True + 0 + + True + False + + + + + 0 + False + True + + + + + + True + True + _Only use VPN connection for these addresses + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True - 2 - 2 False - 6 - 12 + 6 - + True True True @@ -232,85 +419,34 @@ False - 1 - 2 - 0 - 1 + 0 + True + True - + True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - True - _Gateway: - True - False + <i>example: 172.16.0.0/16 10.11.12.0/24</i> + False + True GTK_JUSTIFY_LEFT False False - 1 + 0 0.5 0 0 - vpnc-gateway PANGO_ELLIPSIZE_NONE -1 False 0 - 0 - 1 - 0 - 1 - fill - - - - - - True - G_roup Name: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - vpnc-group-name - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill + 0 + False + True @@ -329,252 +465,12 @@ - - - True - <b>Required</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - Override _user name - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 3 - True - True - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 3 - - - - True - True - True - True - 0 - - True - False - - - - - 0 - True - True - - - - - - True - True - Use _domain for authentication - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 3 - - - - True - True - True - True - 0 - - True - False - - - - - 0 - True - True - - - - - - True - True - _Only use VPN connection for these addresses - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 3 - 12 - 3 - - - - True - False - 6 - - - - True - <i>example: 172.16.0.0/16 10.11.12.0/24</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - True - True - 0 - - True - False - - - 0 - True - True - - - - - - - 0 - True - True - - - - - - - False - True - - - True Optional False - True + False GTK_JUSTIFY_LEFT False False @@ -586,9 +482,6 @@ -1 False 0 - - Optional - tab @@ -603,95 +496,78 @@ - + True GTK_BUTTONBOX_END 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 3 - 0 - 3 + Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. + True + True + GTK_RELIEF_NORMAL + True - + True - Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. - True - True - GTK_RELIEF_NORMAL - True - - Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. - + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + False + 2 - + True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Import Saved Configuration... - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + True + Import _Saved Configuration... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + @@ -702,7 +578,7 @@ 0 - True + False True diff --git a/vpn-daemons/vpnc/properties/nm-vpnc.c b/vpn-daemons/vpnc/properties/nm-vpnc.c index 1b119f7546..8fd7796dfe 100644 --- a/vpn-daemons/vpnc/properties/nm-vpnc.c +++ b/vpn-daemons/vpnc/properties/nm-vpnc.c @@ -56,7 +56,6 @@ struct _NetworkManagerVpnUIImpl { GtkEntry *w_domain; GtkCheckButton *w_use_routes; GtkEntry *w_routes; - GtkExpander *w_opt_info_expander; GtkButton *w_import_button; }; @@ -75,7 +74,6 @@ vpnc_clear_widget (NetworkManagerVpnUIImpl *impl) gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), FALSE); - gtk_expander_set_expanded (impl->w_opt_info_expander, FALSE); } static const char * @@ -153,10 +151,6 @@ impl_get_widget (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, should_expand = TRUE; } - gtk_expander_set_expanded (impl->w_opt_info_expander, should_expand); - - gtk_container_resize_children (GTK_CONTAINER (impl->widget)); - return impl->widget; } @@ -528,8 +522,6 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), have_value); gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), have_value); - gtk_expander_set_expanded (impl->w_opt_info_expander, expand); - if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) { /* If applicable, put up warning that TCP tunneling will be disabled */ @@ -828,9 +820,7 @@ impl_get_object (void) impl->w_routes = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-routes")); impl->w_use_domain = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-domain")); impl->w_domain = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-domain")); - impl->w_opt_info_expander = GTK_EXPANDER (glade_xml_get_widget (impl->xml, - "vpnc-optional-information-expander")); - impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml, + impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-import-button")); impl->callback = NULL;