colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement the spec correctly for DeviceAdded and DeviceRemoved signals.

Browse Source
This commit is contained in:
Tambet Ingo
2009-02-10 15:26:51 +02:00
parent 1f08d4c408
commit 28fd7f7820
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mm-manager.c
View File

@@ -207,7 +207,7 @@ add_modem (MMManager *manager, const char *udi, MMModem *modem)
g_hash_table_insert (priv->modems, g_strdup (udi), modem);
dbus_g_connection_register_g_object (priv->connection, udi, G_OBJECT (modem));
g_signal_emit (manager, signals[DEVICE_ADDED], 0, udi);
g_signal_emit (manager, signals[DEVICE_ADDED], 0, modem);
}
static MMModem *
@@ -351,7 +351,7 @@ device_removed (LibHalContext *ctx, const char *udi)
modem = modem_exists (manager, udi);
if (modem) {
g_debug ("Removed modem %s", udi);
g_signal_emit (manager, signals[DEVICE_REMOVED], 0, udi);
g_signal_emit (manager, signals[DEVICE_REMOVED], 0, modem);
g_hash_table_remove (MM_MANAGER_GET_PRIVATE (manager)->modems, udi);
}
}
@@ -439,9 +439,9 @@ mm_manager_class_init (MMManagerClass *manager_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMManagerClass, device_added),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1,
G_TYPE_STRING);
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
G_TYPE_OBJECT);
signals[DEVICE_REMOVED] =
g_signal_new ("device-removed",
@@ -449,9 +449,9 @@ mm_manager_class_init (MMManagerClass *manager_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMManagerClass, device_removed),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
G_TYPE_STRING);
G_TYPE_OBJECT);
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class),
&dbus_glib_mm_manager_object_info);

4
src/mm-manager.h
View File

@@ -25,8 +25,8 @@ typedef struct {
GObjectClass parent;
/* Signals */
void (*device_added) (MMManager *manager, const char *device_udi);
void (*device_removed) (MMManager *manager, const char *device_udi);
void (*device_added) (MMManager *manager, MMModem *device);
void (*device_removed) (MMManager *manager, MMModem *device);
} MMManagerClass;
GType mm_manager_get_type (void);