Synchronize codebase with pptp v0.9.4 plugin + fix warnings

README

@@ -9,7 +9,7 @@ Build
 =====
 
     ./autogen.sh
-    ./configure
+    ./configure  # (optional)
     make
     sudo make install
 

auth-dialog/main.c

@@ -153,7 +153,7 @@ get_secrets (const char *vpn_uuid,
 		g_key_file_set_string (keyfile, UI_KEYFILE_GROUP, "Description", prompt);
 		g_key_file_set_string (keyfile, UI_KEYFILE_GROUP, "Title", _("Authenticate VPN"));
 
-		keyfile_add_entry_info (keyfile, NM_PPTP_KEY_PASSWORD, pw ? pw : "", _("Password:"), TRUE, allow_interaction);
+		keyfile_add_entry_info (keyfile, NM_L2TP_KEY_PASSWORD, pw ? pw : "", _("Password:"), TRUE, allow_interaction);
 
 		keyfile_print_stdout (keyfile);
 		g_key_file_unref (keyfile);
@@ -278,7 +278,7 @@ main (int argc, char *argv[])
 	if (!external_ui_mode) {
 		/* dump the passwords to stdout */
 		if (password)
-			printf ("%s\n%s\n", NM_PPTP_KEY_PASSWORD, password);
+			printf ("%s\n%s\n", NM_L2TP_KEY_PASSWORD, password);
 		printf ("\n\n");
 
 		gnome_keyring_memory_free (password);

autogen.sh

 #!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+REQUIRED_AUTOMAKE_VERSION=1.9
+PKG_NAME=NetworkManager-l2tp
+
+(test -f $srcdir/configure.ac \
+  && test -f $srcdir/auth-dialog/main.c) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+(cd $srcdir;
+    autoreconf --install --symlink &&
+    intltoolize --force &&
+    autoreconf &&
+    ./configure --enable-maintainer-mode $@
+)
 
-[ ! -e m4 ] && mkdir m4
-autoreconf --verbose --install --force
-intltoolize --copy --force --automake

properties/Makefile.am

@@ -16,22 +16,16 @@ ui_DATA = nm-l2tp-dialog.ui
 
 libnm_l2tp_properties_la_CFLAGS =                    \
         $(GTK_CFLAGS)                                   \
-        $(GCONF_CFLAGS)                                 \
-        $(LIBGNOMEUI_CFLAGS)                            \
-        $(GNOMEKEYRING_CFLAGS)                          \
-        $(NM_CFLAGS)                              \
+        $(NM_CFLAGS)                        \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
-        -DUIDIR=\""$(uidir)"\" 								\
+        -DUIDIR=\""$(uidir)"\"                          \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
-        -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
+	-DGTK_DISABLE_DEPRECATED                        \
         -DVERSION=\"$(VERSION)\"
 
-libnm_l2tp_properties_la_LIBADD =    \
-        $(GTK_LIBS)                     \
-        $(GCONF_LIBS)                   \
-        $(LIBGNOMEUI_LIBS)              \
+libnm_l2tp_properties_la_LIBADD = \
+        $(GTK_LIBS) \
         $(NM_LIBS)
 
 libnm_l2tp_properties_la_LDFLAGS =   \

properties/advanced-dialog.c

@@ -551,23 +551,23 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
 	}
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_allow_bsdcomp"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NOBSDCOMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_allow_deflate"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NODEFLATE), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_usevj"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NO_VJ_COMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder,"ppp_usepcomp"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NO_PCOMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_useaccomp"));
-	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) /* negate */
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		g_hash_table_insert (hash, g_strdup (NM_L2TP_KEY_NO_ACCOMP), g_strdup ("yes"));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "ppp_send_echo_packets"));

properties/import-export.c

@@ -201,7 +201,6 @@ import_ip4 (GKeyFile *keyfile, NMSettingIP4Config *s_ip4, GError **error)
 		char **dnses;
 		gsize length;
 		struct in_addr addr;
-		guint32 dns;
 
 		dnses = g_key_file_get_string_list (keyfile, IP4_SECTION, NM_SETTING_IP4_CONFIG_DNS,
 		                                    &length, error);
@@ -240,7 +239,7 @@ import_ip4 (GKeyFile *keyfile, NMSettingIP4Config *s_ip4, GError **error)
 		                                     &length, error);
 		for (i=0; i<length; i++){
 			NMIP4Route *route;
-			guint32 dest, prefix, next_hop, metric;
+			guint32 prefix, metric;
 			char *ptr, *dest_s, *prefix_s, *next_hop_s, *metric_s;
 
 			route = nm_ip4_route_new ();
@@ -489,7 +488,6 @@ static gboolean
 export_ip4(NMSettingIP4Config *s_ip4, GKeyFile *keyfile, GError **error)
 {
 	const char *str_val;
-	int int_val;
 	gboolean bool_val;
 	guint32 num_dns;
 	guint32 num_dns_searches;
@@ -532,8 +530,6 @@ export_ip4(NMSettingIP4Config *s_ip4, GKeyFile *keyfile, GError **error)
 		char *routes[num_routes];
 		NMIP4Route *route;
 		struct in_addr addr;
-		char *dest_addr;
-		char *nhop_addr;
 
 		for (i=0; i<num_routes; i++){
 			guint32 dest, prefix, nhop, metric;

properties/ipsec-dialog.c

@@ -81,9 +81,6 @@ handle_enable_changed (GtkWidget *check, gboolean is_init, GtkBuilder *builder)
 {
 	GtkWidget *widget;
 	gboolean enabledp;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid;
 
 	enabledp = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
 
@@ -172,9 +169,6 @@ ipsec_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
 	GHashTable *hash;
 	GtkWidget *widget;
 	GtkBuilder *builder;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	gboolean valid;
 
 	g_return_val_if_fail (dialog != NULL, NULL);
 	if (error)

properties/nm-l2tp.c

@@ -29,6 +29,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 #include <gtk/gtk.h>
@@ -162,7 +163,7 @@ check_validity (L2tpPluginUiWidget *self, GError **error)
 	L2tpPluginUiWidgetPrivate *priv = L2TP_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
 	GtkWidget *widget;
 	const char *str;
-	char *s;
+	char *s=NULL;
 
 	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry"));
 	str = gtk_entry_get_text (GTK_ENTRY (widget));
@@ -253,8 +254,7 @@ advanced_button_clicked_cb (GtkWidget *button, gpointer user_data)
 {
 	L2tpPluginUiWidget *self = L2TP_PLUGIN_UI_WIDGET (user_data);
 	L2tpPluginUiWidgetPrivate *priv = L2TP_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
-	GtkWidget *dialog;
-	GtkWindow *toplevel;
+	GtkWidget *dialog, *toplevel;
 
 	toplevel = gtk_widget_get_toplevel (priv->widget);
 	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
@@ -283,8 +283,7 @@ ipsec_button_clicked_cb (GtkWidget *button, gpointer user_data)
 {
 	L2tpPluginUiWidget *self = L2TP_PLUGIN_UI_WIDGET (user_data);
 	L2tpPluginUiWidgetPrivate *priv = L2TP_PLUGIN_UI_WIDGET_GET_PRIVATE (self);
-	GtkWidget *dialog;
-	GtkWindow *toplevel;
+	GtkWidget *dialog, *toplevel;
 
 	toplevel = gtk_widget_get_toplevel (priv->widget);
 	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
@@ -576,7 +575,7 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
 	NMSettingVPN *s_vpn;
 	GtkWidget *widget;
 	const char *str;
-	char *s;
+	char *s=NULL;
 	gboolean valid = FALSE;
 
 	if (!check_validity (self, error))
@@ -669,7 +668,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 		g_object_unref(object);
 		return NULL;
 	}
-	g_free(ui_file);
+	g_free (ui_file);
 
 	priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "l2tp-vbox"));
 	if (!priv->widget) {

src/nm-l2tp-pppd-plugin.c

@@ -230,13 +230,13 @@ nm_ip_up (void *data, int arg)
 }
 
 static int
-get_chap_check()
+get_chap_check(void)
 {
 	return 1;
 }
 
 static int
-get_pap_check()
+get_pap_check(void)
 {
 	return 1;
 }