mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-04 04:50:30 +01:00
2007-05-07 Tambet Ingo <tambet@ximian.com>
* src/nm-dbus-manager.c (proxy_name_owner_changed, nm_dbus_manager_class_init): Remove the DbusConnection argument from 'name-owner-changed' signal. The manager is already passed as a first argument to the signal and the connection is easy enough to get from it. * src/vpn-manager/nm-vpn-service.c (nm_vpn_service_name_owner_changed): Update the signature of the function. * src/vpn-manager/nm-vpn-manager.c (nm_name_owner_changed_handler): Ditto. * src/NetworkManager.c: Ditto. * src/named-manager/nm-named-manager.c (nm_named_manager_name_owner_changed): Ditto. * src/supplicant-manager/nm-supplicant-manager.c (nm_supplicant_manager_name_owner_changed): Ditto. * src/nm-hal-manager.c (name_owner_changed): Ditto. * src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_name_owner_changed): Ditto. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2567 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
5dc9b90a83
commit
40db9193d3
10 changed files with 34 additions and 24 deletions
25
ChangeLog
25
ChangeLog
|
|
@ -1,5 +1,30 @@
|
|||
2007-05-07 Tambet Ingo <tambet@ximian.com>
|
||||
|
||||
* src/nm-dbus-manager.c
|
||||
(proxy_name_owner_changed, nm_dbus_manager_class_init): Remove the
|
||||
DbusConnection argument from 'name-owner-changed' signal. The manager
|
||||
is already passed as a first argument to the signal and the connection
|
||||
is easy enough to get from it.
|
||||
|
||||
* src/vpn-manager/nm-vpn-service.c (nm_vpn_service_name_owner_changed):
|
||||
Update the signature of the function.
|
||||
|
||||
* src/vpn-manager/nm-vpn-manager.c (nm_name_owner_changed_handler):
|
||||
Ditto.
|
||||
|
||||
* src/NetworkManager.c: Ditto.
|
||||
|
||||
* src/named-manager/nm-named-manager.c
|
||||
(nm_named_manager_name_owner_changed): Ditto.
|
||||
|
||||
* src/supplicant-manager/nm-supplicant-manager.c
|
||||
(nm_supplicant_manager_name_owner_changed): Ditto.
|
||||
|
||||
* src/nm-hal-manager.c (name_owner_changed): Ditto.
|
||||
|
||||
* src/dhcp-manager/nm-dhcp-manager.c
|
||||
(nm_dhcp_manager_name_owner_changed): Ditto.
|
||||
|
||||
* src/nm-hal-manager.c: Add a list of device detectors and creators
|
||||
to make it easier to add new devices. Each device type has it's own
|
||||
entry in the table so adding new device types is only a matter of
|
||||
|
|
|
|||
|
|
@ -154,7 +154,6 @@ static void nm_data_free (NMData *data)
|
|||
|
||||
static void
|
||||
nm_name_owner_changed_handler (NMDBusManager *mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ static void nm_dhcp_manager_cancel_transaction_real (NMDHCPManager *manager,
|
|||
gboolean blocking);
|
||||
|
||||
static void nm_dhcp_manager_name_owner_changed (NMDBusManager *dbus_mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
@ -859,7 +858,6 @@ out:
|
|||
*/
|
||||
static void
|
||||
nm_dhcp_manager_name_owner_changed (NMDBusManager *dbus_mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
|
|||
|
|
@ -98,7 +98,6 @@ nm_named_manager_error_quark (void)
|
|||
*/
|
||||
static void
|
||||
nm_named_manager_name_owner_changed (NMDBusManager *dbus_mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
|
|||
|
|
@ -160,16 +160,14 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass)
|
|||
G_STRUCT_OFFSET (NMDBusManagerClass, dbus_connection_changed),
|
||||
NULL, NULL, nm_marshal_VOID__POINTER,
|
||||
G_TYPE_NONE, 1, G_TYPE_POINTER);
|
||||
klass->dbus_connection_changed = NULL;
|
||||
|
||||
nm_dbus_manager_signals[NAME_OWNER_CHANGED] =
|
||||
g_signal_new ("name-owner-changed",
|
||||
G_OBJECT_CLASS_TYPE (object_class),
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (NMDBusManagerClass, name_owner_changed),
|
||||
NULL, NULL, nm_marshal_VOID__POINTER_STRING_STRING_STRING,
|
||||
G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
||||
klass->name_owner_changed = NULL;
|
||||
NULL, NULL, nm_marshal_VOID__STRING_STRING_STRING,
|
||||
G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
||||
|
||||
g_type_class_add_private (klass, sizeof (NMDBusManagerPrivate));
|
||||
}
|
||||
|
|
@ -545,10 +543,9 @@ proxy_name_owner_changed (DBusGProxy *proxy,
|
|||
}
|
||||
}
|
||||
|
||||
g_signal_emit (G_OBJECT (self),
|
||||
g_signal_emit (self,
|
||||
nm_dbus_manager_signals[NAME_OWNER_CHANGED],
|
||||
0,
|
||||
NM_DBUS_MANAGER_GET_PRIVATE (self)->connection,
|
||||
name, old_owner, new_owner);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -367,7 +367,6 @@ hal_deinit (NMHalManager *manager)
|
|||
|
||||
static void
|
||||
name_owner_changed (NMDBusManager *dbus_mgr,
|
||||
DBusGConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
VOID:OBJECT
|
||||
VOID:STRING,POINTER,INT
|
||||
VOID:POINTER
|
||||
VOID:POINTER,STRING,STRING,STRING
|
||||
VOID:STRING,STRING,STRING
|
||||
VOID:UINT,UINT
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ G_DEFINE_TYPE (NMSupplicantManager, nm_supplicant_manager, G_TYPE_OBJECT)
|
|||
|
||||
|
||||
static void nm_supplicant_manager_name_owner_changed (NMDBusManager *dbus_mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
@ -146,19 +145,16 @@ nm_supplicant_manager_class_init (NMSupplicantManagerClass *klass)
|
|||
|
||||
static void
|
||||
nm_supplicant_manager_name_owner_changed (NMDBusManager *dbus_mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
const char *old_owner,
|
||||
const char *new_owner,
|
||||
gpointer user_data)
|
||||
{
|
||||
NMSupplicantManager * self = (NMSupplicantManager *) user_data;
|
||||
gboolean old_owner_good = (old && strlen (old));
|
||||
gboolean new_owner_good = (new && strlen (new));
|
||||
gboolean old_owner_good = (old_owner && strlen (old_owner));
|
||||
gboolean new_owner_good = (new_owner && strlen (new_owner));
|
||||
|
||||
g_return_if_fail (connection != NULL);
|
||||
|
||||
/* Can't handle the signal if its not from the supplicant service */
|
||||
/* Can't handle the signal if its not from the supplicant service */
|
||||
if (strcmp (WPAS_DBUS_SERVICE, name) != 0)
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ static void load_services (NMVPNManager *manager, GHashTable *table);
|
|||
|
||||
static void
|
||||
nm_name_owner_changed_handler (NMDBusManager *mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@ static gboolean nm_vpn_service_process_signal (DBusConnection *connection,
|
|||
gpointer user_data);
|
||||
|
||||
static void nm_vpn_service_name_owner_changed (NMDBusManager *mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
@ -1215,7 +1214,6 @@ nm_vpn_service_dbus_connection_changed (NMDBusManager *mgr,
|
|||
|
||||
static void
|
||||
nm_vpn_service_name_owner_changed (NMDBusManager *mgr,
|
||||
DBusConnection *connection,
|
||||
const char *name,
|
||||
const char *old,
|
||||
const char *new,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue