08f137fc11
- Fixed 926225 - Fixed dependency to libreswan. - Created a new sub package NetworkManager-openswan-gnome - Various other spec file fixes. - Additional code changes are as follows: - Fixed an issue where proper network stack is not loaded unless _stackmanager is run before starting pluto daemon service. - Fixed the termination operation of pluto daemon to comply with libreswan changes. - Fixed various debug messages. - Fixed initiation of pluto daemon by this plugin to reflect the changes in libreaswan. - Fixed defaults values for more parameters to help the VPN connection stay more reliable. - Rewrote pluto watch API which watches the pluto process for its status. Fixed memory leak issues as not all child processes were reaped correctly. Also g_spwan_close_pid was not being called after children were reaped. Also modified debugs and added more to help with debugging in the future. - Fixed an issue where nm-openswan service is searching for ipsec binary in both /sbin and /usr/sbin leading to same operation twice, as /sbin is just symlink to /usr/sbin, so removed /sbin from the search paths. - Fixed some libreswan related macro changes. - Fixed netmask issue when sending IP information to the nm openswan plugin service. - Fixed the current code as it does not set the default route field NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT when sending VPN information to nm-openswan plugin. This fix sets the field to TRUE. - Fixed some issues found by coverity scan. - Fixed an issue where writing configuration on stdin should not end with \n as it gives error. It used to work previously, but not with latest NetworkManager versions. - libreswan related fixes, as some macros have been modified after forking to libreswan from openswan. - openswan/libreswan does not provide tun0 interface, so fixed the code where it sends tun0 interface. - Fix prcoessing of nm-openswan-dialog.ui file and added more error notifications. - Fixed dead code based on coverity scan. - Fixed gnomekeyring lib dependencies. - Fixed Networkmanager and related lib dependencies. - Fixed gtk label max width issue by setting it to 35. - NM-openswan was missing support for nm-openswan-auth-dialog.desktop.in.in. So added a new nm-openswan-auth-dialog.desktop.in.in, and modified related Makefile and configure.ac files.
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From fc10d570b9291e687e4b1dfbfcf8c5c8f5f38f02 Mon Sep 17 00:00:00 2001
|
|
From: Avesh Agarwal <avagarwa@redhat.com>
|
|
Date: Tue, 10 Dec 2013 13:39:57 -0500
|
|
Subject: [PATCH 02/20] Fixed gtk label max width issue by setting it to 35.
|
|
|
|
---
|
|
auth-dialog/vpn-password-dialog.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/auth-dialog/vpn-password-dialog.c b/auth-dialog/vpn-password-dialog.c
|
|
index 9fa2509..685e17e 100644
|
|
--- a/auth-dialog/vpn-password-dialog.c
|
|
+++ b/auth-dialog/vpn-password-dialog.c
|
|
@@ -29,6 +29,8 @@
|
|
#include <glib/gi18n.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
+#include "src/nm-openswan-service.h"
|
|
+
|
|
G_DEFINE_TYPE (VpnPasswordDialog, vpn_password_dialog, GTK_TYPE_DIALOG)
|
|
|
|
#define VPN_PASSWORD_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
|
|
@@ -278,6 +280,7 @@ vpn_password_dialog_new (const char *title,
|
|
message_label = GTK_LABEL (gtk_label_new (message));
|
|
gtk_label_set_justify (message_label, GTK_JUSTIFY_LEFT);
|
|
gtk_label_set_line_wrap (message_label, TRUE);
|
|
+ gtk_label_set_max_width_chars (message_label, 35);
|
|
gtk_size_group_add_widget (priv->group, GTK_WIDGET (message_label));
|
|
gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), FALSE, FALSE, 0);
|
|
gtk_size_group_add_widget (priv->group, priv->table_alignment);
|
|
--
|
|
1.8.3.1
|
|
|