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

sim: rename 'MMSim' to 'MMBaseSim'

Browse Source 
Just so that we don't have same header names in src/ and /libmm-glib.
This commit is contained in:
Aleksander Morgado
2014-07-06 16:55:29 +02:00
parent a29382be70
commit 5358d6fea0
37 changed files with 612 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pantech/mm-broadband-modem-pantech.c
+1 -1
View File
@@ -86,7 +86,7 @@ load_supported_storages (MMIfaceModemMessaging *self,
/*****************************************************************************/
/* Create SIM (Modem interface) */
static MMSim *
static MMBaseSim *
create_sim_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
plugins/pantech/mm-sim-pantech.c
+15 -15
View File
@@ -26,11 +26,11 @@
#include "mm-sim-pantech.h"
G_DEFINE_TYPE (MMSimPantech, mm_sim_pantech, MM_TYPE_SIM);
G_DEFINE_TYPE (MMSimPantech, mm_sim_pantech, MM_TYPE_BASE_SIM)
/*****************************************************************************/
MMSim *
MMBaseSim *
mm_sim_pantech_new_finish (GAsyncResult *res,
GError **error)
{
@@ -45,23 +45,23 @@ mm_sim_pantech_new_finish (GAsyncResult *res,
return NULL;
/* Only export valid SIMs */
mm_sim_export (MM_SIM (sim));
mm_base_sim_export (MM_BASE_SIM (sim));
return MM_SIM (sim);
return MM_BASE_SIM (sim);
}
void
mm_sim_pantech_new (MMBaseModem *modem,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_async_initable_new_async (MM_TYPE_SIM_PANTECH,
G_PRIORITY_DEFAULT,
cancellable,
callback,
user_data,
MM_SIM_MODEM, modem,
MM_BASE_SIM_MODEM, modem,
NULL);
}
@@ -73,14 +73,14 @@ mm_sim_pantech_init (MMSimPantech *self)
static void
mm_sim_pantech_class_init (MMSimPantechClass *klass)
{
MMSimClass *sim_class = MM_SIM_CLASS (klass);
MMBaseSimClass *base_sim_class = MM_BASE_SIM_CLASS (klass);
/* Skip querying most SIM card info, +CRSM just shoots the Pantech modems
* (at least the UMW190) in the head */
sim_class->load_sim_identifier = NULL;
sim_class->load_sim_identifier_finish = NULL;
sim_class->load_operator_identifier = NULL;
sim_class->load_operator_identifier_finish = NULL;
sim_class->load_operator_name = NULL;
sim_class->load_operator_name_finish = NULL;
base_sim_class->load_sim_identifier = NULL;
base_sim_class->load_sim_identifier_finish = NULL;
base_sim_class->load_operator_identifier = NULL;
base_sim_class->load_operator_identifier_finish = NULL;
base_sim_class->load_operator_name = NULL;
base_sim_class->load_operator_name_finish = NULL;
}
plugins/pantech/mm-sim-pantech.h
+9 -9
View File
@@ -19,7 +19,7 @@
#include <glib.h>
#include <glib-object.h>
#include "mm-sim.h"
#include "mm-base-sim.h"
#define MM_TYPE_SIM_PANTECH (mm_sim_pantech_get_type ())
#define MM_SIM_PANTECH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SIM_PANTECH, MMSimPantech))
@@ -32,20 +32,20 @@ typedef struct _MMSimPantech MMSimPantech;
typedef struct _MMSimPantechClass MMSimPantechClass;
struct _MMSimPantech {
MMSim parent;
MMBaseSim parent;
};
struct _MMSimPantechClass {
MMSimClass parent;
MMBaseSimClass parent;
};
GType mm_sim_pantech_get_type (void);
void mm_sim_pantech_new (MMBaseModem *modem,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMSim *mm_sim_pantech_new_finish (GAsyncResult *res,
GError **error);
void mm_sim_pantech_new (MMBaseModem *modem,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
MMBaseSim *mm_sim_pantech_new_finish (GAsyncResult *res,
GError **error);
#endif /* MM_SIM_PANTECH_H */