Commit 4fe5a5e2 authored by Dan Williams's avatar Dan Williams

2006-02-27 Dan Williams <dcbw@redhat.com>

	* gnome/applet/*
		- Mass search/replace of:
			nmwa -> nma
			NMWirelessApplet -> NMApplet
			NM_*_WIRELESS_APPLET -> NM_*_APPLET
		   (it ain't just for wireless anymore, ma!)
		- Fix duplicate function name printing when using nm_warning
		- wireless-applet.glade -> applet.glade


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1501 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent e64e90cd
2006-02-27 Dan Williams <dcbw@redhat.com>
* gnome/applet/*
- Mass search/replace of:
nmwa -> nma
NMWirelessApplet -> NMApplet
NM_*_WIRELESS_APPLET -> NM_*_APPLET
(it ain't just for wireless anymore, ma!)
- Fix duplicate function name printing when using nm_warning
- wireless-applet.glade -> applet.glade
2006-02-27 Dan Williams <dcbw@redhat.com>
* dispatcher-daemon/NetworkManagerDispatcher.c
......
......@@ -119,7 +119,7 @@ endif
gladedir = $(datadir)/nm-applet
glade_DATA = wireless-applet.glade keyring.png
glade_DATA = applet.glade keyring.png
dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = nm-applet.conf
......
This diff is collapsed.
......@@ -31,27 +31,27 @@
#include "wireless-network.h"
#include "wireless-security-option.h"
void nmwa_dbus_update_one_vpn_connection (DBusConnection *connection, const char *name, NMWirelessApplet *applet, gboolean is_active);
void nmwa_dbus_update_vpn_connections (NMWirelessApplet *applet);
gboolean nmwa_dbus_update_device_strength (NMWirelessApplet *applet);
void nmwa_dbus_update_nm_state (NMWirelessApplet *applet);
void nmwa_dbus_update_devices (NMWirelessApplet *applet);
void nmwa_dbus_update_dialup (NMWirelessApplet *applet);
void nmwa_dbus_dialup_activate_connection (NMWirelessApplet *applet, const char *name);
void nmwa_dbus_dialup_deactivate_connection (NMWirelessApplet *applet, const char *name);
void nmwa_dbus_device_update_one_device (NMWirelessApplet *applet, const char *dev_path);
void nmwa_dbus_device_activated (NMWirelessApplet *applet, const char *dev_path, const char *essid);
void nmwa_dbus_device_deactivated (NMWirelessApplet *applet, const char *dev_path);
void nmwa_dbus_device_remove_one_device (NMWirelessApplet *applet, const char *dev_path);
void nmwa_dbus_device_update_one_network (NMWirelessApplet *applet, const char *dev_path, const char *net_path, const char *active_net_path);
void nmwa_dbus_device_remove_one_network (NMWirelessApplet *applet, const char *dev_path, const char *net_path);
void nmwa_dbus_update_strength (NMWirelessApplet *applet, const char *dev_path, const char *net_path, int strength);
void nmwa_dbus_set_device (DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
void nmwa_dbus_create_network (DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
void nmwa_free_data_model (NMWirelessApplet *applet);
void nma_dbus_update_one_vpn_connection (DBusConnection *connection, const char *name, NMApplet *applet, gboolean is_active);
void nma_dbus_update_vpn_connections (NMApplet *applet);
gboolean nma_dbus_update_device_strength (NMApplet *applet);
void nma_dbus_update_nm_state (NMApplet *applet);
void nma_dbus_update_devices (NMApplet *applet);
void nma_dbus_update_dialup (NMApplet *applet);
void nma_dbus_dialup_activate_connection (NMApplet *applet, const char *name);
void nma_dbus_dialup_deactivate_connection (NMApplet *applet, const char *name);
void nma_dbus_device_update_one_device (NMApplet *applet, const char *dev_path);
void nma_dbus_device_activated (NMApplet *applet, const char *dev_path, const char *essid);
void nma_dbus_device_deactivated (NMApplet *applet, const char *dev_path);
void nma_dbus_device_remove_one_device (NMApplet *applet, const char *dev_path);
void nma_dbus_device_update_one_network (NMApplet *applet, const char *dev_path, const char *net_path, const char *active_net_path);
void nma_dbus_device_remove_one_network (NMApplet *applet, const char *dev_path, const char *net_path);
void nma_dbus_update_strength (NMApplet *applet, const char *dev_path, const char *net_path, int strength);
void nma_dbus_set_device (DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
void nma_dbus_create_network (DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
void nma_free_data_model (NMApplet *applet);
#endif
......@@ -71,7 +71,7 @@ static inline gboolean nmi_network_type_valid (NMNetworkType type)
typedef struct NMGetNetworkKeyCBData
{
NMWirelessApplet *applet;
NMApplet *applet;
DBusMessage *message;
NetworkDevice *dev;
char *net_path;
......@@ -97,7 +97,7 @@ static void nmi_dbus_get_network_key_callback (GnomeKeyringResult result,
gpointer data)
{
NMGetNetworkKeyCBData * cb_data = (NMGetNetworkKeyCBData*) data;
NMWirelessApplet * applet = cb_data->applet;
NMApplet * applet = cb_data->applet;
DBusMessage * message = cb_data->message;
NetworkDevice * dev = cb_data->dev;
char * net_path = cb_data->net_path;
......@@ -141,7 +141,7 @@ nmi_dbus_get_key_for_network (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
char * dev_path = NULL;
char * net_path = NULL;
char * essid = NULL;
......@@ -164,7 +164,7 @@ nmi_dbus_get_key_for_network (DBusConnection *connection,
DBUS_TYPE_INVALID))
return NULL;
if (!(dev = nmwa_get_device_for_nm_path (applet->device_list, dev_path)))
if (!(dev = nma_get_device_for_nm_path (applet->device_list, dev_path)))
return NULL;
/* If we don't have a record of the network yet in GConf, ask for
......@@ -259,7 +259,7 @@ nmi_dbus_cancel_get_key_for_network (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
g_return_val_if_fail (applet != NULL, NULL);
......@@ -309,7 +309,7 @@ nmi_dbus_get_networks (DBusConnection *connection,
{
const char * NO_NET_ERROR = "NoNetworks";
const char * NO_NET_ERROR_MSG = "There are no wireless networks stored.";
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
GSList * dir_list = NULL;
GSList * elt;
DBusMessage * reply = NULL;
......@@ -386,7 +386,7 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
DBusMessage * reply = NULL;
gchar * gconf_key = NULL;
char * network = NULL;
......@@ -543,7 +543,7 @@ nmi_dbus_get_vpn_connections (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
GSList * dir_list = NULL;
GSList * elt = NULL;
DBusMessage * reply = NULL;
......@@ -614,7 +614,7 @@ nmi_dbus_get_vpn_connection_properties (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
DBusMessage * reply = NULL;
char * vpn_connection = NULL;
char * escaped_name = NULL;
......@@ -680,7 +680,7 @@ nmi_dbus_get_vpn_connection_vpn_data (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
DBusMessage * reply = NULL;
gchar * gconf_key = NULL;
char * name = NULL;
......@@ -753,7 +753,7 @@ nmi_dbus_get_vpn_connection_routes (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
DBusMessage * reply = NULL;
gchar * gconf_key = NULL;
char * name = NULL;
......@@ -823,7 +823,7 @@ nmi_dbus_get_vpn_connection_routes (DBusConnection *connection,
*
*/
static void
nmi_save_network_info (NMWirelessApplet *applet,
nmi_save_network_info (NMApplet *applet,
const char *essid,
gboolean automatic,
const char *bssid,
......@@ -959,7 +959,7 @@ nmi_dbus_update_network_info (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
NMApplet * applet = (NMApplet *) user_data;
char * essid = NULL;
gboolean automatic;
NMGConfWSO * gconf_wso = NULL;
......@@ -1026,7 +1026,7 @@ out:
*/
DBusHandlerResult nmi_dbus_info_message_handler (DBusConnection *connection, DBusMessage *message, void *user_data)
{
NMWirelessApplet * applet = (NMWirelessApplet *)user_data;
NMApplet * applet = (NMApplet *)user_data;
DBusMessage * reply = NULL;
gboolean handled;
......
This diff is collapsed.
......@@ -27,14 +27,14 @@
#include <dbus/dbus.h>
#include "vpn-connection.h"
void nmwa_dbus_vpn_set_last_attempt_status (NMWirelessApplet *applet, const char *vpn_name, gboolean last_attempt_success);
void nma_dbus_vpn_set_last_attempt_status (NMApplet *applet, const char *vpn_name, gboolean last_attempt_success);
void nmwa_dbus_vpn_update_one_vpn_connection (NMWirelessApplet *applet, const char *vpn_name);
void nmwa_dbus_vpn_update_vpn_connections (NMWirelessApplet *applet);
void nmwa_dbus_vpn_remove_one_vpn_connection (NMWirelessApplet *applet, const char *vpn_name);
void nma_dbus_vpn_update_one_vpn_connection (NMApplet *applet, const char *vpn_name);
void nma_dbus_vpn_update_vpn_connections (NMApplet *applet);
void nma_dbus_vpn_remove_one_vpn_connection (NMApplet *applet, const char *vpn_name);
void nmwa_dbus_vpn_activate_connection (DBusConnection *connection, const char *name, GSList *passwords);
void nmwa_dbus_vpn_deactivate_connection (DBusConnection *connection);
void nmwa_dbus_vpn_update_vpn_connection_stage (NMWirelessApplet *applet, const char *vpn_name, NMVPNActStage vpn_state);
void nma_dbus_vpn_activate_connection (DBusConnection *connection, const char *name, GSList *passwords);
void nma_dbus_vpn_deactivate_connection (DBusConnection *connection);
void nma_dbus_vpn_update_vpn_connection_stage (NMApplet *applet, const char *vpn_name, NMVPNActStage vpn_state);
#endif
This diff is collapsed.
......@@ -42,10 +42,10 @@ static inline gboolean message_is_error (DBusMessage *msg)
return (dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_ERROR);
}
void nmwa_dbus_init_helper (NMWirelessApplet *applet);
void nmwa_dbus_enable_wireless (NMWirelessApplet *applet, gboolean enabled);
void nmwa_dbus_enable_networking (NMWirelessApplet *applet, gboolean enabled);
void nmwa_free_gui_data_model (NMWirelessApplet *applet);
void nmwa_free_dbus_data_model (NMWirelessApplet *applet);
void nma_dbus_init_helper (NMApplet *applet);
void nma_dbus_enable_wireless (NMApplet *applet, gboolean enabled);
void nma_dbus_enable_networking (NMApplet *applet, gboolean enabled);
void nma_free_gui_data_model (NMApplet *applet);
void nma_free_dbus_data_model (NMApplet *applet);
#endif
......@@ -23,7 +23,7 @@
#include "applet-notifications.h"
void
nmwa_send_event_notification (NMWirelessApplet *applet,
nma_send_event_notification (NMApplet *applet,
NotifyUrgency urgency,
const char *summary,
const char *message,
......
......@@ -25,7 +25,7 @@
#include "applet.h"
void
nmwa_send_event_notification (NMWirelessApplet *applet,
nma_send_event_notification (NMApplet *applet,
NotifyUrgency urgency,
const char *summary,
const char *message,
......
This diff is collapsed.
......@@ -46,24 +46,17 @@
typedef struct VPNConnection VPNConnection;
enum NMWAEncryptionKeyTypes
{
KEY_TYPE_128_BIT_PASSPHRASE = 0,
KEY_TYPE_ASCII_KEY = 1,
KEY_TYPE_HEX_KEY = 2
};
#define NM_TYPE_WIRELESS_APPLET (nmwa_get_type())
#define NM_WIRELESS_APPLET(object) (G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_WIRELESS_APPLET, NMWirelessApplet))
#define NM_WIRELESS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIRELESS_APPLET, NMWirelessAppletClass))
#define NM_IS_WIRELESS_APPLET(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), NM_TYPE_WIRELESS_APPLET))
#define NM_IS_WIRELESS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_WIRELESS_APPLET))
#define NM_WIRELESS_APPLET_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), NM_TYPE_WIRELESS_APPLET, NMWirelessAppletClass))
#define NM_TYPE_APPLET (nma_get_type())
#define NM_APPLET(object) (G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_APPLET, NMApplet))
#define NM_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_APPLET, NMAppletClass))
#define NM_IS_APPLET(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), NM_TYPE_APPLET))
#define NM_IS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_APPLET))
#define NM_APPLET_GET_CLASS(object)(G_TYPE_INSTANCE_GET_CLASS((object), NM_TYPE_APPLET, NMAppletClass))
typedef struct
{
EggTrayIconClass parent_class;
} NMWirelessAppletClass;
} NMAppletClass;
/*
* Applet instance data
......@@ -126,28 +119,28 @@ typedef struct
GtkWidget * passphrase_dialog;
GladeXML * info_dialog_xml;
} NMWirelessApplet;
} NMApplet;
typedef struct
{
NMWirelessApplet * applet;
NMApplet * applet;
NetworkDevice * dev;
GladeXML * xml;
} DriverNotifyCBData;
NetworkDevice * nmwa_get_device_for_nm_path (GSList *dev_list, const char *nm_dev);
NMWirelessApplet * nmwa_new (void);
void nmwa_schedule_warning_dialog (NMWirelessApplet *applet, const char *msg);
gboolean nmwa_driver_notify (gpointer user_data);
void nmwa_show_vpn_failure_alert (NMWirelessApplet *applet, const char *member, const char *vpn_name, const char *error_msg);
void nmwa_show_vpn_login_banner (NMWirelessApplet *applet, const char *vpn_name, const char *banner);
NetworkDevice * nma_get_device_for_nm_path (GSList *dev_list, const char *nm_dev);
NMApplet * nma_new (void);
void nma_schedule_warning_dialog (NMApplet *applet, const char *msg);
gboolean nma_driver_notify (gpointer user_data);
void nma_show_vpn_failure_alert (NMApplet *applet, const char *member, const char *vpn_name, const char *error_msg);
void nma_show_vpn_login_banner (NMApplet *applet, const char *vpn_name, const char *banner);
NetworkDevice * nmwa_get_first_active_device (GSList *dev_list);
VPNConnection * nmwa_get_first_active_vpn_connection (NMWirelessApplet *applet);
NetworkDevice * nma_get_first_active_device (GSList *dev_list);
VPNConnection * nma_get_first_active_vpn_connection (NMApplet *applet);
void nmwa_enable_wireless_set_active (NMWirelessApplet *applet);
void nma_enable_wireless_set_active (NMApplet *applet);
void nmwa_set_state (NMWirelessApplet *applet, NMState state);
void nma_set_state (NMApplet *applet, NMState state);
int nm_null_safe_strcmp (const char *s1, const char *s2);
......
......@@ -44,8 +44,8 @@ static gboolean session_save (GnomeClient *client, gpointer client_data)
int main (int argc, char *argv[])
{
NMWirelessApplet * nmwa;
GnomeClient * client = NULL;
NMApplet * nma;
GnomeClient * client = NULL;
gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
argc, argv,
......@@ -61,9 +61,9 @@ int main (int argc, char *argv[])
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
if ((nmwa = nmwa_new ()))
if ((nma = nma_new ()))
{
gtk_widget_show_all (GTK_WIDGET (nmwa));
gtk_widget_show_all (GTK_WIDGET (nma));
gtk_main ();
}
......
......@@ -83,13 +83,13 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
}
/*
* nmwa_ond_device_combo_changed
* nma_ond_device_combo_changed
*
* Replace current wireless security information with options
* suitable for the current network device.
*
*/
static void nmwa_ond_device_combo_changed (GtkWidget *dev_combo, gpointer user_data)
static void nma_ond_device_combo_changed (GtkWidget *dev_combo, gpointer user_data)
{
GtkDialog * dialog = (GtkDialog *) user_data;
WirelessSecurityManager * wsm;
......@@ -141,13 +141,13 @@ static void nmwa_ond_device_combo_changed (GtkWidget *dev_combo, gpointer user_d
/*
* nmwa_ond_security_combo_changed
* nma_ond_security_combo_changed
*
* Replace the current wireless security widgets with new ones
* according to what the user chose.
*
*/
static void nmwa_ond_security_combo_changed (GtkWidget *combo, gpointer user_data)
static void nma_ond_security_combo_changed (GtkWidget *combo, gpointer user_data)
{
GtkDialog * dialog = (GtkDialog *) user_data;
WirelessSecurityManager * wsm;
......@@ -182,7 +182,7 @@ static void nmwa_ond_security_combo_changed (GtkWidget *combo, gpointer user_dat
update_button_cb (NULL, dialog);
}
static GtkTreeModel * create_wireless_adapter_model (NMWirelessApplet *applet)
static GtkTreeModel * create_wireless_adapter_model (NMApplet *applet)
{
GtkListStore * model;
GSList * elt;
......@@ -256,7 +256,7 @@ static const char * get_host_name (void)
static GtkDialog *nmwa_ond_init (GladeXML *xml, NMWirelessApplet *applet, gboolean create_network)
static GtkDialog *nma_ond_init (GladeXML *xml, NMApplet *applet, gboolean create_network)
{
GtkDialog * dialog = NULL;
GtkWidget * network_name_entry;
......@@ -314,7 +314,7 @@ static GtkDialog *nmwa_ond_init (GladeXML *xml, NMWirelessApplet *applet, gboole
combo = glade_xml_get_widget (xml, "wireless_adapter_combo");
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
g_signal_connect (G_OBJECT (combo), "changed", GTK_SIGNAL_FUNC (nmwa_ond_device_combo_changed), dialog);
g_signal_connect (G_OBJECT (combo), "changed", GTK_SIGNAL_FUNC (nma_ond_device_combo_changed), dialog);
if (n_wireless_interfaces == 1)
{
......@@ -338,8 +338,8 @@ static GtkDialog *nmwa_ond_init (GladeXML *xml, NMWirelessApplet *applet, gboole
security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));
wsm_update_combo (wsm, security_combo);
g_signal_connect (G_OBJECT (security_combo), "changed", GTK_SIGNAL_FUNC (nmwa_ond_security_combo_changed), dialog);
nmwa_ond_security_combo_changed (GTK_WIDGET (security_combo), dialog);
g_signal_connect (G_OBJECT (security_combo), "changed", GTK_SIGNAL_FUNC (nma_ond_security_combo_changed), dialog);
nma_ond_security_combo_changed (GTK_WIDGET (security_combo), dialog);
if (create_network)
{
......@@ -378,17 +378,17 @@ static GtkDialog *nmwa_ond_init (GladeXML *xml, NMWirelessApplet *applet, gboole
}
static void nmwa_ond_response_cb (GtkDialog *dialog, gint response, gpointer data)
static void nma_ond_response_cb (GtkDialog *dialog, gint response, gpointer data)
{
GladeXML * xml;
NMWirelessApplet * applet;
NMApplet * applet;
gboolean create_network;
GtkTreeModel * model;
GtkComboBox * combo;
WirelessSecurityManager *wsm;
xml = (GladeXML *) g_object_get_data (G_OBJECT (dialog), "glade-xml");
applet = (NMWirelessApplet *) g_object_get_data (G_OBJECT (dialog), "applet");
applet = (NMApplet *) g_object_get_data (G_OBJECT (dialog), "applet");
create_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "create-network"));
combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "wireless_adapter_combo"));
......@@ -420,9 +420,9 @@ static void nmwa_ond_response_cb (GtkDialog *dialog, gint response, gpointer dat
opt = wsm_get_option_for_active (wsm, security_combo);
if (create_network)
nmwa_dbus_create_network (applet->connection, dev, essid, opt);
nma_dbus_create_network (applet->connection, dev, essid, opt);
else
nmwa_dbus_set_device (applet->connection, dev, essid, opt);
nma_dbus_set_device (applet->connection, dev, essid, opt);
}
}
......@@ -440,7 +440,7 @@ static void nmwa_ond_response_cb (GtkDialog *dialog, gint response, gpointer dat
}
void nmwa_other_network_dialog_run (NMWirelessApplet *applet, gboolean create_network)
void nma_other_network_dialog_run (NMApplet *applet, gboolean create_network)
{
GtkWidget * dialog;
GladeXML * xml;
......@@ -450,13 +450,13 @@ void nmwa_other_network_dialog_run (NMWirelessApplet *applet, gboolean create_ne
if (!(xml = glade_xml_new (applet->glade_file, "other_network_dialog", NULL)))
{
nmwa_schedule_warning_dialog (applet, _("The NetworkManager Applet could not find some required resources (the glade file was not found)."));
nma_schedule_warning_dialog (applet, _("The NetworkManager Applet could not find some required resources (the glade file was not found)."));
return;
}
if (!(dialog = GTK_WIDGET (nmwa_ond_init (xml, applet, create_network))))
if (!(dialog = GTK_WIDGET (nma_ond_init (xml, applet, create_network))))
return;
g_signal_connect (dialog, "response", G_CALLBACK (nmwa_ond_response_cb), NULL);
g_signal_connect (dialog, "response", G_CALLBACK (nma_ond_response_cb), NULL);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
gtk_widget_realize (dialog);
......
......@@ -25,6 +25,6 @@
#ifndef OTHER_NETWORK_DIALOG_H
#define OTHER_NETWORK_DIALOG_H
void nmwa_other_network_dialog_run (NMWirelessApplet *applet, gboolean create_network);
void nma_other_network_dialog_run (NMApplet *applet, gboolean create_network);
#endif
......@@ -127,7 +127,7 @@ nmi_passphrase_dialog_response_received (GtkWidget *dialog,
gint response,
gpointer user_data)
{
NMWirelessApplet * applet;
NMApplet * applet;
GladeXML * xml;
GtkComboBox * security_combo;
DBusMessage * message;
......@@ -139,7 +139,7 @@ nmi_passphrase_dialog_response_received (GtkWidget *dialog,
message = (DBusMessage *) g_object_get_data (G_OBJECT (dialog), "dbus-message");
g_assert (message);
applet = (NMWirelessApplet *) g_object_get_data (G_OBJECT (dialog), "applet");
applet = (NMApplet *) g_object_get_data (G_OBJECT (dialog), "applet");
g_assert (applet);
if (response != GTK_RESPONSE_OK)
......@@ -180,7 +180,7 @@ out:
* to the given UID.
*/
GtkWidget *
nmi_passphrase_dialog_new (NMWirelessApplet *applet,
nmi_passphrase_dialog_new (NMApplet *applet,
guint32 uid,
NetworkDevice *dev,
WirelessNetwork *net,
......@@ -224,7 +224,7 @@ nmi_passphrase_dialog_new (NMWirelessApplet *applet,
if (!(xml = glade_xml_new (applet->glade_file, "passphrase_dialog", NULL)))
{
nmwa_schedule_warning_dialog (applet, _("The NetworkManager Applet could not find some required resources (the glade file was not found)."));
nma_schedule_warning_dialog (applet, _("The NetworkManager Applet could not find some required resources (the glade file was not found)."));
wsm_free (wsm);
return NULL;
}
......@@ -280,7 +280,7 @@ nmi_passphrase_dialog_new (NMWirelessApplet *applet,
* Dispose of the passphrase dialog and its data
*
*/
void nmi_passphrase_dialog_destroy (NMWirelessApplet *applet)
void nmi_passphrase_dialog_destroy (NMApplet *applet)
{
char * data;
GtkWidget * dialog;
......
......@@ -26,13 +26,13 @@
#include "nm-device.h"
#include "wireless-network.h"
GtkWidget * nmi_passphrase_dialog_new (NMWirelessApplet *applet,
GtkWidget * nmi_passphrase_dialog_new (NMApplet *applet,
guint32 uid,
NetworkDevice *dev,
WirelessNetwork *net,
DBusMessage *message);
void nmi_passphrase_dialog_destroy (NMWirelessApplet *applet);
void nmi_passphrase_dialog_destroy (NMApplet *applet);
#endif /* PASSPHRASE_DIALOG_H */
......@@ -32,7 +32,7 @@ struct VPNConnection
};
VPNConnection *nmwa_vpn_connection_new (const char *name)
VPNConnection *nma_vpn_connection_new (const char *name)
{
VPNConnection *vpn;
......@@ -46,7 +46,7 @@ VPNConnection *nmwa_vpn_connection_new (const char *name)
}
VPNConnection *nmwa_vpn_connection_copy (VPNConnection *src_vpn)
VPNConnection *nma_vpn_connection_copy (VPNConnection *src_vpn)
{
VPNConnection *dst_vpn;
......@@ -62,7 +62,7 @@ VPNConnection *nmwa_vpn_connection_copy (VPNConnection *src_vpn)
}
void nmwa_vpn_connection_ref (VPNConnection *vpn)
void nma_vpn_connection_ref (VPNConnection *vpn)
{
g_return_if_fail (vpn != NULL);
......@@ -70,7 +70,7 @@ void nmwa_vpn_connection_ref (VPNConnection *vpn)
}
void nmwa_vpn_connection_unref (VPNConnection *vpn)
void nma_vpn_connection_unref (VPNConnection *vpn)
{
g_return_if_fail (vpn != NULL);
......@@ -85,14 +85,14 @@ void nmwa_vpn_connection_unref (VPNConnection *vpn)
}
const char *nmwa_vpn_connection_get_name (VPNConnection *vpn)
const char *nma_vpn_connection_get_name (VPNConnection *vpn)
{
g_return_val_if_fail (vpn != NULL, NULL);
return vpn->name;
}
const char *nmwa_vpn_connection_get_service (VPNConnection *vpn)
const char *nma_vpn_connection_get_service (VPNConnection *vpn)
{
g_return_val_if_fail (vpn != NULL, NULL);
......@@ -100,7 +100,7 @@ const char *nmwa_vpn_connection_get_service (VPNConnection *vpn)
}
void nmwa_vpn_connection_set_service (VPNConnection *vpn, const char *service)
void nma_vpn_connection_set_service (VPNConnection *vpn, const char *service)
{
g_return_if_fail (vpn != NULL);
g_return_if_fail (service != NULL);
......@@ -113,14 +113,14 @@ void nmwa_vpn_connection_set_service (VPNConnection *vpn, const char *service)
static int is_same_name (VPNConnection *vpn, const char *name)
{
if (!vpn || !name || !nmwa_vpn_connection_get_name (vpn))
if (!vpn || !name || !nma_vpn_connection_get_name (vpn))
return -1;
return strcmp (nmwa_vpn_connection_get_name (vpn), name);
return strcmp (nma_vpn_connection_get_name (vpn), name);
}
VPNConnection *nmwa_vpn_connection_find_by_name (GSList *list, const char *name)
VPNConnection *nma_vpn_connection_find_by_name (GSList *list, const char *name)
{
GSList *elt;
VPNConnection *vpn = NULL;
......@@ -136,27 +136,27 @@ VPNConnection *nmwa_vpn_connection_find_by_name (GSList *list, const char *name)
return vpn;
}
NMVPNActStage nmwa_vpn_connection_get_stage (VPNConnection *vpn)
NMVPNActStage nma_vpn_connection_get_stage (VPNConnection *vpn)
{
g_return_val_if_fail (vpn != NULL, NM_VPN_ACT_STAGE_UNKNOWN);
return vpn->stage;
}
void nmwa_vpn_connection_set_stage (VPNConnection *vpn, NMVPNActStage stage)
void nma_vpn_connection_set_stage (VPNConnection *vpn, NMVPNActStage stage)
{
g_return_if_fail (vpn != NULL);
vpn->stage = stage;
}
gboolean nmwa_vpn_connection_is_activating (VPNConnection *vpn)
gboolean nma_vpn_connection_is_activating (VPNConnection *vpn)
{
NMVPNActStage stage;
g_return_val_if_fail (vpn != NULL, FALSE);
stage = nmwa_vpn_connection_get_stage (vpn);
stage = nma_vpn_connection_get_stage (vpn);
if (stage == NM_VPN_ACT_STAGE_PREPARE ||
stage == NM_VPN_ACT_STAGE_CONNECT ||
stage == NM_VPN_ACT_STAGE_IP_CONFIG_GET)
......
......@@ -25,21 +25,21 @@
#include "applet.h"
#include "NetworkManagerVPN.h"
VPNConnection * nmwa_vpn_connection_new (const char *name);
VPNConnection * nmwa_vpn_connection_copy (VPNConnection *vpn);
void nmwa_vpn_connection_ref (VPNConnection *vpn);
void nmwa_vpn_connection_unref (VPNConnection *vpn);
VPNConnection * nma_vpn_connection_new (const char *name);
VPNConnection * nma_vpn_connection_copy (VPNConnection *vpn);
void nma_vpn_connection_ref (VPNConnection *vpn);
void nma_vpn_connection_unref (VPNConnection *vpn);
const char * nmwa_vpn_connection_get_name (VPNConnection *vpn);
const char * nma_vpn_connection_get_name (VPNConnection *vpn);
const char * nmwa_vpn_connection_get_service (VPNConnection *vpn);
void nmwa_vpn_connection_set_service (VPNConnection *vpn, const char *service);
const char * nma_vpn_connection_get_service (VPNConnection *vpn);
void nma_vpn_connection_set_service (VPNConnection *vpn, const char *service);
NMVPNActStage nmwa_vpn_connection_get_stage (VPNConnection *vpn);
void nmwa_vpn_connection_set_stage (VPNConnection *vpn, NMVPNActStage stage);
NMVPNActStage nma_vpn_connection_get_stage (VPNConnection *vpn);
void nma_vpn_connection_set_stage (VPNConnection *vpn, NMVPNActStage stage);
gboolean nmwa_vpn_connection_is_activating (VPNConnection *vpn);
gboolean nma_vpn_connection_is_activating (VPNConnection *vpn);
VPNConnection * nmwa_vpn_connection_find_by_name (GSList *list, const char *name);
VPNConnection * nma_vpn_connection_find_by_name (GSList *list, const char *name);
#endif
......@@ -86,7 +86,7 @@ out:
}
GSList *
nmwa_vpn_request_password (NMWirelessApplet *applet, const char *name, const char *service, gboolean retry)
nma_vpn_request_password (NMApplet *applet, const char *name, const char *service, gboolean retry)
{
const char *argv[] = {NULL /*"/usr/libexec/nm-vpnc-auth-dialog"*/,
"-n", NULL /*"davidznet42"*/,
......
......@@ -24,7 +24,7 @@
#include "applet.h"