Hello community, here is the log from the commit of package NetworkManager-vpnc checked in at Wed Apr 12 10:12:28 CEST 2006. -------- --- NetworkManager-vpnc/NetworkManager-vpnc.changes 2006-03-29 21:16:27.000000000 +0200 +++ STABLE/NetworkManager-vpnc/NetworkManager-vpnc.changes 2006-04-10 22:09:59.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 10 22:08:53 CEST 2006 - rml@suse.de + +- Report error if configuration export fails (Novell bug #164980) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-vpnc.spec ++++++ --- /var/tmp/diff_new_pack.mBejZm/_old 2006-04-12 10:12:22.000000000 +0200 +++ /var/tmp/diff_new_pack.mBejZm/_new 2006-04-12 10:12:22.000000000 +0200 @@ -17,7 +17,7 @@ %define sysconfdir /etc Summary: NetworkManager VPN Support for vpnc Version: 0.5.0cvs20060202 -Release: 10 +Release: 12 License: GPL Group: Productivity/Networking/System URL: http://people.redhat.com/dcbw/NetworkManager/ @@ -88,6 +88,8 @@ /opt/gnome/share/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog -n NetworkManager-vpnc +* Mon Apr 10 2006 - rml@suse.de +- Report error if configuration export fails (Novell bug #164980) * Wed Mar 29 2006 - rml@suse.de - Send MSS parameter to NetworkManager (see bug #157988) * Mon Mar 20 2006 - rml@suse.de ++++++ nm-vpnc-0.6-branch.patch ++++++ --- /var/tmp/diff_new_pack.mBejZm/_old 2006-04-12 10:12:22.000000000 +0200 +++ /var/tmp/diff_new_pack.mBejZm/_new 2006-04-12 10:12:22.000000000 +0200 @@ -1,6 +1,87 @@ -diff -urN NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service.c /home/rml/src/NetworkManager/NetworkManager-0.6-branch/vpn-daemons/vpnc/src/nm-vpnc-service.c +diff -urN NetworkManager-vpnc-0.5.0cvs20060202/properties/nm-vpnc.c NetworkManager/vpn-daemons/vpnc/properties/nm-vpnc.c +--- NetworkManager-vpnc-0.5.0cvs20060202/properties/nm-vpnc.c 2005-08-15 15:34:20.000000000 -0400 ++++ NetworkManager/vpn-daemons/vpnc/properties/nm-vpnc.c 2006-04-10 16:05:31.000000000 -0400 +@@ -1,5 +1,5 @@ + /*************************************************************************** +- * CVSID: $Id: nm-vpnc.c,v 1.5 2005/08/15 19:34:20 caillon Exp $ ++ * CVSID: $Id: nm-vpnc.c,v 1.6 2006/04/10 20:05:31 rml Exp $ + * + * nm-vpnc.c : GNOME UI dialogs for configuring vpnc VPN connections + * +@@ -627,7 +627,7 @@ + return import_from_file (impl, path); + } + +-static void ++static gboolean + export_to_file (NetworkManagerVpnUIImpl *impl, const char *path, + GSList *properties, GSList *routes, const char *connection_name) + { +@@ -638,6 +638,7 @@ + const char *username = NULL; + const char *domain = NULL; + char *routes_str = NULL; ++ gboolean ret = TRUE; + + /*printf ("in export_to_file; path='%s'\n", path);*/ + +@@ -681,7 +682,10 @@ + + f = fopen (path, "w"); + if (f == NULL) ++ { ++ ret = FALSE; + goto out; ++ } + + fprintf (f, + "[main]\n" +@@ -730,8 +734,9 @@ + + fclose (f); + out: +- + g_free (routes_str); ++ ++ return ret; + } + + +@@ -763,7 +768,7 @@ + /*printf ("User selected '%s'\n", path);*/ + + } +- ++ + gtk_widget_destroy (dialog); + + if (path != NULL) { +@@ -785,8 +790,20 @@ + goto out; + } + +- export_to_file (impl, path, properties, routes, connection_name); +- } ++ if (!export_to_file (impl, path, properties, routes, connection_name)) { ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_CLOSE, ++ _("Failed to export configuration")); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), ++ _("Failed to save file %s"), path); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ } ++ } + + out: + g_free (path); +diff -urN NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service.c NetworkManager/vpn-daemons/vpnc/src/nm-vpnc-service.c --- NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service.c 2006-01-16 17:58:13.000000000 -0500 -+++ /home/rml/src/NetworkManager/NetworkManager-0.6-branch/vpn-daemons/vpnc/src/nm-vpnc-service.c 2006-03-29 14:03:05.000000000 -0500 ++++ NetworkManager/vpn-daemons/vpnc/src/nm-vpnc-service.c 2006-03-29 14:26:53.000000000 -0500 @@ -576,9 +576,11 @@ static gboolean nm_vpnc_dbus_handle_start_vpn (DBusMessage *message, NmVpncData *data) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...