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

device,plugin: let the MMPlugin' API know about MMDevice'

Browse Source
This commit is contained in:
Aleksander Morgado
2012-07-11 12:26:22 +02:00
parent 884aa7f2eb
commit bfc3cb27e1
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mm-device.c
View File

@@ -23,6 +23,7 @@
#include <mm-errors-types.h>
#include "mm-device.h"
#include "mm-plugin.h"
#include "mm-utils.h"
#include "mm-log.h"
@@ -377,9 +378,7 @@ mm_device_create_modem (MMDevice *self,
mm_plugin_get_name (self->priv->plugin),
g_list_length (self->priv->port_probes));
self->priv->modem = mm_plugin_create_modem (self->priv->plugin,
G_OBJECT (self),
error);
self->priv->modem = mm_plugin_create_modem (self->priv->plugin, self, error);
if (self->priv->modem) {
/* Keep the object manager */
self->priv->object_manager = g_object_ref (object_manager);
@@ -434,24 +433,26 @@ mm_device_get_udev_device (MMDevice *self)
void
mm_device_set_plugin (MMDevice *self,
MMPlugin *plugin)
GObject *plugin)
{
g_object_set (self,
MM_DEVICE_PLUGIN, plugin,
NULL);
}
MMPlugin *
GObject *
mm_device_peek_plugin (MMDevice *self)
{
return self->priv->plugin;
return (self->priv->plugin ?
G_OBJECT (self->priv->plugin) :
NULL);
}
MMPlugin *
GObject *
mm_device_get_plugin (MMDevice *self)
{
return (self->priv->plugin ?
MM_PLUGIN (g_object_ref (self->priv->plugin)) :
g_object_ref (self->priv->plugin) :
NULL);
}