Commit 314e6fc4 authored by Chris Aillon's avatar Chris Aillon Committed by Chris Aillon
Browse files

2005-09-10 Christopher Aillon <caillon@redhat.com>

	* gnome/applet/applet.c:
	* gnome/applet/applet-dbus-devices.c:
	* gnome/applet/applet-dbus-info.c:
	* gnome/applet/passphrase-dialog.c:
	* gnome/libnm_glib/libnm_glib.c:
	* gnome/vpn-properties/nm-vpn-properties.c:
	* src/autoip.c:
	* src/backends/NetworkManagerRedHat.c:
	* src/named-manager/nm-named-manager.c:
	* src/NetworkManagerAPList.c:
	* src/NetworkManager.c:
	* src/NetworkManagerDbus.c:
	* src/NetworkManagerDevice.c:
	* src/NetworkManagerPolicy.c:
	* src/NetworkManagerSystem.c:
	* src/nm-dbus-device.c:
	* src/nm-dbus-nm.c:
	* src/vpn-manager/nm-vpn-manager.c:
	* src/vpn-manager/nm-vpn-service.c:
	* test/libnm_glib_test.c:
	* test/nminfotest.c:
	* test/nmtestdevices.c:
	Fix up a bunch of 'unused variable' compiler warnings


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@959 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 96174e04
2005-09-10 Christopher Aillon <caillon@redhat.com>
* gnome/applet/applet.c:
* gnome/applet/applet-dbus-devices.c:
* gnome/applet/applet-dbus-info.c:
* gnome/applet/passphrase-dialog.c:
* gnome/libnm_glib/libnm_glib.c:
* gnome/vpn-properties/nm-vpn-properties.c:
* src/autoip.c:
* src/backends/NetworkManagerRedHat.c:
* src/named-manager/nm-named-manager.c:
* src/NetworkManagerAPList.c:
* src/NetworkManager.c:
* src/NetworkManagerDbus.c:
* src/NetworkManagerDevice.c:
* src/NetworkManagerPolicy.c:
* src/NetworkManagerSystem.c:
* src/nm-dbus-device.c:
* src/nm-dbus-nm.c:
* src/vpn-manager/nm-vpn-manager.c:
* src/vpn-manager/nm-vpn-service.c:
* test/libnm_glib_test.c:
* test/nminfotest.c:
* test/nmtestdevices.c:
Fix a bunch of 'unused variable' compiler warnings
* NetworkManager.h:
* gnome/applet/applet-dbus-info.c:
* gnome/applet/applet-dbus-info.h:
......
......@@ -868,24 +868,28 @@ out:
void nmwa_dbus_dialup_activate_connection (NMWirelessApplet *applet, const char *name)
{
DBusMessage *message;
DBusMessageIter iter;
DBusMessageIter iter_array;
g_return_if_fail (name != NULL);
if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "activateDialup")))
{
nm_info ("Activating dialup connection '%s'.", name);
#if 0
dbus_message_iter_init_append (message, &iter);
dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name);
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &iter_array);
for (i = passwords; i != NULL; i = g_slist_next (i)) {
dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &(i->data));
{
DBusMessageIter iter;
DBusMessageIter iter_array;
dbus_message_iter_init_append (message, &iter);
dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name);
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &iter_array);
for (i = passwords; i != NULL; i = g_slist_next (i)) {
dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &(i->data));
}
dbus_message_iter_close_container (&iter, &iter_array);
}
dbus_message_iter_close_container (&iter, &iter_array);
#endif
dbus_message_append_args (message, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
if (!dbus_connection_send (applet->connection, message, NULL))
nm_warning ("nmwa_dbus_activate_dialup_connection(): Could not send activateDialup message!");
......
......@@ -194,8 +194,6 @@ static DBusMessage * nmi_dbus_get_key_for_network (NMWirelessApplet *applet, DBu
void nmi_dbus_return_user_key (DBusConnection *connection, DBusMessage *message, const char *passphrase, const NMEncKeyType key_type)
{
DBusMessage * reply;
const char * dev_path;
const char * net_path;
const int tmp_key_type = (int)key_type;
g_return_if_fail (connection != NULL);
......@@ -659,7 +657,7 @@ static DBusMessage *nmi_dbus_get_vpn_connection_properties (NMWirelessApplet *ap
}
else
{
DBusMessageIter iter, array_iter;
DBusMessageIter iter;
reply = dbus_message_new_method_return (message);
dbus_message_iter_init_append (reply, &iter);
......@@ -923,16 +921,12 @@ static void nmi_save_network_info (NMWirelessApplet *applet, const char *essid,
*/
static void nmi_dbus_update_network_info (NMWirelessApplet *applet, DBusMessage *message)
{
DBusMessage * reply_message = NULL;
char * network = NULL;
NMDeviceAuthMethod auth_method = NM_DEVICE_AUTH_METHOD_UNKNOWN;
char * enc_key_source = NULL;
int enc_key_type = -1;
char * key;
gboolean user_requested;
GConfValue * value;
DBusError error;
char * escaped_network;
dbus_bool_t args_good;
g_return_if_fail (applet != NULL);
......
......@@ -210,7 +210,6 @@ static gboolean nmwa_update_info (NMWirelessApplet *applet)
GtkWidget *label;
struct ifreq ifr;
int fd, flags;
gboolean ret_val = TRUE;
const char *iface = NULL;
NetworkDevice *dev;
gboolean ret = TRUE;
......@@ -348,10 +347,6 @@ static void nmwa_show_info_cb (GtkMenuItem *mi, NMWirelessApplet *applet)
static void nmwa_about_cb (NMWirelessApplet *applet)
{
GdkPixbuf *pixbuf;
char *file;
GtkWidget *about_dialog;
static const gchar *authors[] =
{
"The Red Hat Desktop Team, including:\n",
......@@ -383,6 +378,10 @@ static void nmwa_about_cb (NMWirelessApplet *applet)
};
#if !GTK_CHECK_VERSION(2,6,0)
GdkPixbuf *pixbuf;
char *file;
GtkWidget *about_dialog;
/* GTK 2.4 and earlier, have to use libgnome for about dialog */
file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-networktool.png", FALSE, NULL);
pixbuf = gdk_pixbuf_new_from_file (file, NULL);
......@@ -802,7 +801,6 @@ gboolean nmwa_driver_notify (gpointer user_data)
char * label_text = NULL;
char * temp = NULL;
GtkButton * button;
NMDriverSupportLevel support_level;
guint32 timestamp;
g_return_val_if_fail (cb_data != NULL, FALSE);
......@@ -1517,8 +1515,6 @@ static void nmwa_menu_add_text_item (GtkWidget *menu, char *text)
*/
static void nmwa_menu_add_device_item (GtkWidget *menu, NetworkDevice *device, gint n_devices, NMWirelessApplet *applet)
{
GtkWidget * menu_item;
g_return_if_fail (menu != NULL);
g_return_if_fail (device != NULL);
g_return_if_fail (applet != NULL);
......@@ -1672,7 +1668,6 @@ static void nmwa_has_encrypted_networks_helper (NetworkDevice *dev, WirelessNetw
*/
static void nmwa_menu_device_add_networks (GtkWidget *menu, NetworkDevice *dev, NMWirelessApplet *applet)
{
GSList * list;
gboolean has_encrypted = FALSE;
AddNetworksCB * add_networks_cb = NULL;
......@@ -1766,7 +1761,6 @@ static void nmwa_menu_add_dialup_menu (GtkWidget *menu, NMWirelessApplet *applet
{
GtkMenuItem *item;
GtkMenu *dialup_menu;
GtkMenuItem *other_item;
GSList *elt;
g_return_if_fail (menu != NULL);
......@@ -1807,7 +1801,6 @@ static gboolean is_vpn_available (void)
result = FALSE;
if ((dir = g_dir_open (VPN_NAME_FILES_DIR, 0, NULL)) != NULL) {
const char *f;
if (g_dir_read_name (dir) != NULL)
result = TRUE;
g_dir_close (dir);
......@@ -2053,7 +2046,6 @@ static GtkWidget *nmwa_dropdown_menu_create (GtkMenuItem *parent, NMWirelessAppl
*/
static void nmwa_context_menu_update (NMWirelessApplet *applet)
{
GtkWidget *image;
GSList *element;
gboolean have_wireless = FALSE;
......@@ -2189,7 +2181,6 @@ static gboolean nmwa_toplevel_menu_button_press_cb (GtkWidget *widget, GdkEventB
static void nmwa_setup_widgets (NMWirelessApplet *applet)
{
GtkWidget *menu_bar;
GtkWidget *event_box;
/* Event box for tooltips */
applet->event_box = gtk_event_box_new ();
......@@ -2368,8 +2359,6 @@ static void nmwa_destroy (NMWirelessApplet *applet, gpointer user_data)
*/
static GtkWidget * nmwa_get_instance (NMWirelessApplet *applet)
{
GError * error = NULL;
gtk_widget_hide (GTK_WIDGET (applet));
applet->nm_running = FALSE;
......
......@@ -373,7 +373,6 @@ GtkWidget *nmi_passphrase_dialog_init (NMWirelessApplet *applet)
{
GtkWidget * dialog;
GtkButton * ok_button;
GtkButton * cancel_button;
GtkEntry * entry;
GtkComboBox * key_type_combo;
GtkLabel * label;
......
......@@ -418,7 +418,6 @@ static libnm_glib_ctx *libnm_glib_ctx_new (void)
if (!(ctx->callbacks_lock = g_mutex_new ()))
goto error;
success:
return ctx;
error:
......@@ -459,7 +458,6 @@ libnm_glib_ctx *libnm_glib_init (void)
while (!ctx->thread_inited)
g_usleep (G_USEC_PER_SEC / 2);
success:
return ctx;
error:
......
......@@ -119,7 +119,6 @@ out:
static gboolean
add_vpn_connection (const char *conn_name, const char *service_name, GSList *conn_data, GSList *routes)
{
int i;
char *gconf_key;
GtkTreeIter iter;
char conn_gconf_path[PATH_MAX];
......@@ -232,7 +231,6 @@ static gboolean vpn_druid_vpn_type_page_next (GnomeDruidPage *druidpage,
gpointer user_data)
{
GtkWidget *w;
GtkWidget *vbox;
NetworkManagerVpnUI *vpn_ui;
/*printf ("vpn_type_next!\n");*/
......@@ -296,7 +294,6 @@ static gboolean vpn_druid_vpn_details_page_next (GnomeDruidPage *druidpage,
is_valid = vpn_ui->is_valid (vpn_ui);
}
out:
return !is_valid;
}
......@@ -325,7 +322,6 @@ static gboolean vpn_druid_vpn_confirm_page_finish (GnomeDruidPage *druidpage,
GtkWidget *widget,
gpointer user_data)
{
static int vpncon = 0;
GSList *conn_data;
GSList *conn_routes;
char *conn_name;
......@@ -341,7 +337,7 @@ static gboolean vpn_druid_vpn_confirm_page_finish (GnomeDruidPage *druidpage,
add_vpn_connection (conn_name, vpn_ui->get_service_name (vpn_ui), conn_data, conn_routes);
gtk_widget_hide_all (GTK_WIDGET (druid_window));
out:
return FALSE;
}
......@@ -786,9 +782,7 @@ export_cb (GtkButton *button, gpointer user_data)
GSList *conn_vpn_data;
GSList *conn_routes;
const char *conn_name;
char key[PATH_MAX];
char *conn_gconf_path;
GtkTreeIter iter;
/*printf ("edit\n");*/
......@@ -815,7 +809,6 @@ static void get_all_vpn_connections (void)
const char *conn_name;
const char *conn_service_name;
GSList *conn_vpn_data;
GSList *i;
gboolean conn_user_can_edit = TRUE;
conn_gconf_path = (const char *) (vpn_conn->data);
......@@ -865,9 +858,6 @@ static void get_all_vpn_connections (void)
error:
g_free (vpn_conn->data);
}
out:
;
}
static void
......@@ -925,12 +915,9 @@ init_app (void)
{
GtkWidget *w;
gchar *glade_file;
char *file;
GtkTreeIter iter;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GSList *i;
NetworkManagerVpnUI *vpn_ui_interface;
GtkHBox *vpn_type_hbox1;
GDir *dir;
......
......@@ -500,7 +500,6 @@ static void sigterm_handler (int signum)
static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer user_data)
{
NMData * data = user_data;
NMDevice * act_dev = NULL;
nm_info ("Caught terminiation signal");
g_main_loop_quit (data->main_loop);
......@@ -606,8 +605,6 @@ static void nm_device_link_activated (NmNetlinkMonitor *monitor, const gchar *in
{
if (nm_device_is_wired (dev) && !nm_device_has_active_link (dev))
{
NMDevice *act_dev = NULL;
nm_device_set_link_active (dev, TRUE);
nm_policy_schedule_device_change_check (data);
}
......@@ -818,12 +815,9 @@ void nm_hal_deinit (NMData *data)
*/
int main( int argc, char *argv[] )
{
guint link_source_id;
GSource * link_source;
gboolean become_daemon = TRUE;
gboolean enable_test_devices = FALSE;
GError * error = NULL;
DBusError dbus_error;
char * owner;
if ((int)getuid() != 0)
......
......@@ -439,7 +439,6 @@ gboolean nm_ap_list_merge_scanned_ap (NMAccessPointList *list, NMAccessPoint *me
gboolean *new, gboolean *strength_changed)
{
NMAccessPoint *list_ap_addr, *list_ap_essid;
gboolean success = FALSE;
g_return_val_if_fail (list != NULL, FALSE);
g_return_val_if_fail (merge_ap != NULL, FALSE);
......@@ -457,7 +456,6 @@ gboolean nm_ap_list_merge_scanned_ap (NMAccessPointList *list, NMAccessPoint *me
* strength, and the time_last_seen. */
const GTimeVal *merge_ap_seen = nm_ap_get_last_seen (merge_ap);
const GTimeVal *list_ap_addr_seen = nm_ap_get_last_seen (list_ap_addr);
nm_ap_set_encrypted (list_ap_addr, nm_ap_get_encrypted (merge_ap));
nm_ap_set_auth_method (list_ap_addr, nm_ap_get_auth_method (merge_ap));
......
......@@ -745,7 +745,6 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
DBusError error;
const char * essid = NULL;
gint timestamp_secs = -1;
const char * key = NULL;
NMEncKeyType key_type = -1;
gboolean trusted = FALSE;
NMDeviceAuthMethod auth_method = NM_DEVICE_AUTH_METHOD_UNKNOWN;
......
......@@ -1267,7 +1267,6 @@ void nm_device_get_ap_address (NMDevice *dev, struct ether_addr *addr)
void nm_device_set_enc_key (NMDevice *dev, const char *key, NMDeviceAuthMethod auth_method)
{
NMSock *sk;
int err;
struct iwreq wreq;
int keylen;
unsigned char safe_key[IW_ENCODING_TOKEN_MAX + 1];
......@@ -1737,7 +1736,6 @@ NMNetworkMode nm_device_get_mode (NMDevice *dev)
if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL)))
{
struct iwreq wrq;
int err;
memset (&wrq, 0, sizeof (struct iwreq));
#ifdef IOCTL_DEBUG
......@@ -1788,7 +1786,6 @@ gboolean nm_device_set_mode (NMDevice *dev, const NMNetworkMode mode)
if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL)))
{
struct iwreq wreq;
int err;
gboolean mode_good = FALSE;
switch (mode)
......@@ -2337,7 +2334,6 @@ static gboolean nm_device_wireless_wait_for_link (NMDevice *dev, const char *ess
{
guint assoc = 0;
double last_freq = 0;
guint assoc_count = 0;
struct timeval timeout = { .tv_sec = 0, .tv_usec = 0 };
nm_completion_args args;
......@@ -2618,7 +2614,6 @@ static gboolean nm_device_activate_stage3_ip_config_start (NMActRequest *req)
NMData * data = NULL;
NMDevice * dev = NULL;
NMAccessPoint * ap = NULL;
NMIP4Config * ip4_config = NULL;
g_return_val_if_fail (req != NULL, FALSE);
......@@ -2703,7 +2698,6 @@ static NMIP4Config *nm_device_new_ip4_autoip_config (NMDevice *dev)
if (get_autoip (dev, &ip))
{
#define LINKLOCAL_BCAST 0xa9feffff
int temp = ip.s_addr;
config = nm_ip4_config_new ();
......@@ -2937,7 +2931,6 @@ static gboolean nm_device_activate_stage5_ip_config_commit (NMActRequest *req)
{
NMData * data = NULL;
NMDevice * dev = NULL;
NMAccessPoint * ap = NULL;
NMIP4Config * ip4_config = NULL;
g_return_val_if_fail (req != NULL, FALSE);
......@@ -3713,7 +3706,6 @@ static gboolean nm_device_wireless_process_scan_results (gpointer user_data)
NMWirelessScanResults *results = (NMWirelessScanResults *)user_data;
NMDevice *dev;
wireless_scan *tmp_ap;
gboolean have_blank_essids = FALSE;
NMAPListIter *iter;
GTimeVal cur_time;
gboolean list_changed = FALSE;
......
......@@ -47,7 +47,6 @@
static gboolean nm_policy_activation_finish (NMActRequest *req)
{
NMDevice *dev = NULL;
NMAccessPoint *ap = NULL;
NMData *data = NULL;
g_return_val_if_fail (req != NULL, FALSE);
......@@ -85,7 +84,6 @@ static gboolean nm_policy_activation_finish (NMActRequest *req)
nm_dbus_schedule_device_status_change_signal (data, dev, NULL, DEVICE_NOW_ACTIVE);
nm_schedule_state_change_signal_broadcast (data);
out:
return FALSE;
}
......@@ -167,7 +165,6 @@ static gboolean nm_policy_activation_failed (NMActRequest *req)
nm_schedule_state_change_signal_broadcast (data);
nm_policy_schedule_device_change_check (data);
out:
return FALSE;
}
......@@ -551,7 +548,6 @@ static gboolean allowed_list_update_pending = FALSE;
static gboolean nm_policy_allowed_ap_list_update (gpointer user_data)
{
NMData *data = (NMData *)user_data;
GSList *elt;
allowed_list_update_pending = FALSE;
......@@ -622,8 +618,6 @@ static gboolean nm_policy_device_list_update_from_allowed_list (NMData *data)
NMDevice *dev = (NMDevice *)(elt->data);
if (nm_device_is_wireless (dev))
{
NMAccessPoint *best_ap;
if (nm_device_get_supports_wireless_scan (dev))
{
/* Once we have the list, copy in any relevant information from our Allowed list and fill
......
......@@ -186,7 +186,6 @@ gboolean nm_system_device_set_from_ip4_config (NMDevice *dev)
{
NMData * app_data;
NMIP4Config * config;
gboolean success = FALSE;
g_return_val_if_fail (dev != NULL, FALSE);
......@@ -298,7 +297,6 @@ out:
*/
gboolean nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, NMDevice *active_device, const char *iface, NMIP4Config *config, char **routes, int num_routes)
{
gboolean success = FALSE;
NMIP4Config * ad_config = NULL;
g_return_val_if_fail (iface != NULL, FALSE);
......
......@@ -214,7 +214,6 @@ gboolean get_autoip (NMDevice *dev, struct in_addr *out_ip)
int nprobes = 0;
int nannounce = 0;
gboolean success = FALSE;
char *temp_addr;
g_return_val_if_fail (dev != NULL, FALSE);
g_return_val_if_fail (out_ip != NULL, FALSE);
......
......@@ -329,7 +329,6 @@ void nm_system_restart_mdns_responder (void)
void nm_system_device_add_ip6_link_address (NMDevice *dev)
{
char *buf;
char *addr;
struct ether_addr hw_addr;
unsigned char eui[8];
......@@ -809,7 +808,6 @@ GSList * nm_system_get_dialup_config (void)
while ((entry = g_dir_read_name(dir)))
{
NMDialUpConfig *config;
shvarFile *cfg_file;
char *buf;
if (!is_valid_cfg(entry))
......
......@@ -258,7 +258,6 @@ nm_named_manager_error_quark (void)
static void
join_forwarders (gpointer key, gpointer value, gpointer data)
{
guint id = GPOINTER_TO_UINT (key);
const char *server = value;
GString *str = data;
......@@ -604,7 +603,6 @@ compute_domain_searches (NMNamedManager *mgr)
static void
write_nameserver (gpointer key, gpointer value, gpointer data)
{
guint id = GPOINTER_TO_UINT (key);
const char *server = value;
FILE *f = data;
......@@ -787,7 +785,6 @@ typedef struct {
static void
remove_domain_id (gpointer key, gpointer value, gpointer data)
{
const char *domain = key;
GHashTable *servers = value;
NMNamedManagerRemoveData *removedata = data;
......
......@@ -228,8 +228,7 @@ static DBusMessage *nm_dbus_device_get_networks (DBusConnection *connection, DBu
gboolean success = FALSE;
NMAccessPointList *ap_list;
NMAPListIter *list_iter;
char *object_path,
*escaped_object_path;
char *escaped_object_path;
dbus_message_iter_init_append (reply, &iter);
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter_array);
......
......@@ -203,7 +203,6 @@ static DBusMessage *nm_dbus_nm_set_active_device (DBusConnection *connection, DB
char * essid = NULL;
char * key = NULL;
int key_type = -1;
NMActRequest * req = NULL;
NMAccessPoint * ap = NULL;
g_return_val_if_fail (connection != NULL, NULL);
......@@ -463,7 +462,6 @@ static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection,
static DBusMessage *nm_dbus_nm_sleep (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data)
{
GSList *elt;
NMData *app_data;
g_return_val_if_fail (data && data->data && connection && message, NULL);
......@@ -499,7 +497,6 @@ static DBusMessage *nm_dbus_nm_sleep (DBusConnection *connection, DBusMessage *m
static DBusMessage *nm_dbus_nm_wake (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data)
{
GSList *elt;
NMData *app_data;
g_return_val_if_fail (data && data->data && connection && message, NULL);
......
......@@ -310,7 +310,6 @@ gboolean nm_vpn_manager_process_signal (NMVPNManager *manager, DBusMessage *mess
*/
gboolean nm_vpn_manager_process_name_owner_changed (NMVPNManager *manager, const char *changed_service_name, const char *old_owner, const char *new_owner)
{
NMVPNConnection * active;
NMVPNService * service;
gboolean handled = FALSE;
......
......@@ -31,6 +31,8 @@
#include "nm-vpn-act-request.h"
#include "nm-utils.h"
/* define this for getting VPN debug messages */
#undef NM_DEBUG_VPN_CONFIG
struct NMVPNService
{
......@@ -49,6 +51,7 @@ struct NMVPNService
static void nm_vpn_service_add_watch (NMVPNService *service);
static void nm_vpn_service_remove_watch (NMVPNService *service);
static void nm_vpn_service_stop_connection_internal (NMVPNService *service);
#ifdef NM_DEBUG_VPN_CONFIG
static void print_vpn_config (guint32 ip4_vpn_gateway,
const char *tundev,
guint32 ip4_internal_address,
......@@ -59,6 +62,7 @@ static void print_vpn_config (guint32 ip4_vpn_gateway,
guint32 ip4_internal_nbns_len,
const char *dns_domain,
const char *login_banner);
#endif
static void nm_vpn_service_schedule_stage1_daemon_exec (NMVPNService *service, NMVPNActRequest *req);
static void nm_vpn_service_schedule_stage3_connect (NMVPNService *service, NMVPNActRequest *req);
......@@ -252,7 +256,6 @@ void nm_vpn_service_act_request_failed (NMVPNService *service, NMVPNActRequest *
static void nm_vpn_service_activation_success (NMVPNService *service, NMVPNActRequest *req)
{
GSource * source = NULL;
NMVPNConnection * vpn = NULL;
g_assert (service != NULL);
......@@ -479,7 +482,6 @@ static gboolean nm_vpn_service_stage3_connect (gpointer user_data)
dbus_uint32_t password_count;
char ** data_items;
dbus_uint32_t data_count;
DBusError error;
DBusMessage * message;
DBusPendingCall * pcall = NULL;
......@@ -662,7 +664,7 @@ static void nm_vpn_service_stage4_ip_config_get (NMVPNService *service, NMVPNAct
NMDevice * parent_dev;
guint32 i;
#if 0
#ifdef NM_DEBUG_VPN_CONFIG
print_vpn_config (ip4_vpn_gateway, tundev, ip4_internal_address, ip4_internal_netmask,
ip4_internal_dns, ip4_internal_dns_len, ip4_internal_nbns, ip4_internal_nbns_len,
dns_domain, login_banner);
......@@ -897,7 +899,7 @@ gboolean nm_vpn_service_process_signal (NMVPNService *service, NMVPNActRequest *
return TRUE;
}
#ifdef NM_DEBUG_VPN
/*
* Prints config returned from the service daemo
*/
......@@ -948,3 +950,4 @@ static void print_vpn_config (guint32 ip4_vpn_gateway,
nm_info ("-----------------------------------------");
}
#endif