Mailinglist Archive: opensuse-commit (1187 mails)
| < Previous | Next > |
commit NetworkManager-openvpn
- From: root@xxxxxxx (h_root)
- Date: Wed, 12 Apr 2006 10:12:15 +0200 (CEST)
- Message-id: <20060412081215.B0E1C8BE33@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package NetworkManager-openvpn
checked in at Wed Apr 12 10:12:15 CEST 2006.
--------
--- NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-03-29 21:22:50.000000000 +0200
+++ STABLE/NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-04-10 22:39:25.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 10 22:39:02 CEST 2006 - rml@xxxxxxx
+
+- Report error if configuration exportation fails (Novell #164980)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-openvpn.spec ++++++
--- /var/tmp/diff_new_pack.u0FDAF/_old 2006-04-12 10:11:30.000000000 +0200
+++ /var/tmp/diff_new_pack.u0FDAF/_new 2006-04-12 10:11:30.000000000 +0200
@@ -17,7 +17,7 @@
%define sysconfdir /etc
Summary: NetworkManager VPN support for OpenVPN
Version: 0.3.2cvs20060202
-Release: 10
+Release: 12
License: GPL
Group: Productivity/Networking/System
URL: http://www.gnome.org/projects/NetworkManager
@@ -88,6 +88,8 @@
/opt/gnome/share/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
%changelog -n NetworkManager-openvpn
+* Mon Apr 10 2006 - rml@xxxxxxx
+- Report error if configuration exportation fails (Novell #164980)
* Wed Mar 29 2006 - rml@xxxxxxx
- Send per-route MSS information to NetworkManager (bug #157988)
* Mon Mar 20 2006 - rml@xxxxxxx
++++++ nm-openvpn-0.6-branch.patch ++++++
--- /var/tmp/diff_new_pack.u0FDAF/_old 2006-04-12 10:11:30.000000000 +0200
+++ /var/tmp/diff_new_pack.u0FDAF/_new 2006-04-12 10:11:30.000000000 +0200
@@ -1,12 +1,93 @@
-diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service.c NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service.c
+diff -urN NetworkManager-openvpn-0.3.2cvs20060202/properties/nm-openvpn.c NetworkManager/vpn-daemons/openvpn/properties/nm-openvpn.c
+--- NetworkManager-openvpn-0.3.2cvs20060202/properties/nm-openvpn.c 2005-12-06 20:33:00.000000000 -0500
++++ NetworkManager/vpn-daemons/openvpn/properties/nm-openvpn.c 2006-04-10 16:37:28.000000000 -0400
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+- * $Id: nm-openvpn.c,v 1.4 2005/12/07 01:33:00 timn Exp $
++ * $Id: nm-openvpn.c,v 1.6 2006/04/10 20:32:43 rml Exp $
+ *
+ */
+
+@@ -1018,7 +1018,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)
+ {
+@@ -1037,6 +1037,7 @@
+ const char *remote_ip = NULL;
+ const char *username = NULL;
+ char *routes_str = NULL;
++ gboolean ret;
+
+ /*printf ("in export_to_file; path='%s'\n", path);*/
+
+@@ -1129,8 +1130,12 @@
+ /* X-NM-Routes */ routes_str != NULL ? routes_str : "");
+
+ fclose (f);
++ ret = TRUE;
+ }
++ else
++ ret = FALSE;
+ g_free (routes_str);
++ return ret;
+ }
+
+
+@@ -1162,7 +1167,7 @@
+ /*printf ("User selected '%s'\n", path);*/
+
+ }
+-
++
+ gtk_widget_destroy (dialog);
+
+ if (path != NULL) {
+@@ -1180,11 +1185,26 @@
+ _("Do you want to replace it with the one you are saving?"));
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+- if (response == GTK_RESPONSE_OK)
+- export_to_file (impl, path, properties, routes, connection_name);
++ if (response != GTK_RESPONSE_OK)
++ goto out;
++ }
++
++ 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);
+
+ return TRUE;
+diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service.c NetworkManager/vpn-daemons/openvpn/src/nm-openvpn-service.c
--- NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service.c 2006-01-16 17:58:12.000000000 -0500
-+++ NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service.c 2006-03-29 14:24:25.000000000 -0500
++++ NetworkManager/vpn-daemons/openvpn/src/nm-openvpn-service.c 2006-03-29 14:26:52.000000000 -0500
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Id: nm-openvpn-service.c,v 1.9 2006/01/16 22:58:12 dcbw Exp $
-+ * $Id: nm-openvpn-service.c,v 1.10.2.2 2006/03/29 19:24:25 rml Exp $
++ * $Id: nm-openvpn-service.c,v 1.11 2006/03/29 19:26:52 rml Exp $
*
*/
@@ -62,15 +143,15 @@
DBUS_TYPE_STRING, &empty,
DBUS_TYPE_STRING, &empty,
DBUS_TYPE_INVALID);
-diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service-openvpn-helper.c NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
+diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service-openvpn-helper.c NetworkManager/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
--- NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service-openvpn-helper.c 2006-01-16 17:58:12.000000000 -0500
-+++ NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c 2006-03-30 12:20:57.000000000 -0500
++++ NetworkManager/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c 2006-03-30 12:21:18.000000000 -0500
@@ -21,7 +21,7 @@
* (C) Copyright 2005 Red Hat, Inc.
* (C) Copyright 2005 Tim Niemueller
*
- * $Id: nm-openvpn-service-openvpn-helper.c,v 1.6 2006/01/16 22:58:12 dcbw Exp $
-+ * $Id: nm-openvpn-service-openvpn-helper.c,v 1.6.2.1 2006/03/30 17:20:57 rml Exp $
++ * $Id: nm-openvpn-service-openvpn-helper.c,v 1.7 2006/03/30 17:21:18 rml Exp $
*
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |