Commit ec7e094f authored by Chris T's avatar Chris T

Remove code guarding the dbus change settings

This is no longer needed.
parent e47ae48f
......@@ -55,7 +55,6 @@ enum {
enum {
MMSD_MM_MODEM_MMSC_MISCONFIGURED, //the MMSC is the default value
MMSD_MM_MODEM_DBUS_SETTINGS_CHANGED, //MMSC, MMSProxy, and/or MMS APN was changed, but mmsd was not restarted
MMSD_MM_MODEM_NO_BEARERS_ACTIVE, //The Modem has no bearers
MMSD_MM_MODEM_INTERFACE_DISCONNECTED, //mmsd found the right bearer, but it is disconnected
MMSD_MM_MODEM_INCORRECT_APN_CONNECTED, //no APN is connected that matches the settings
......@@ -124,7 +123,6 @@ static const gchar introspection_xml[] =
guint owner_id;
static GDBusNodeInfo *introspection_data = NULL;
struct modem_data *modem;
gboolean dbus_settings_changed;
static void pur_mm_state (int state);
static void pur_mm_disconnect (void);
......@@ -181,8 +179,7 @@ handle_method_call (GDBusConnection *connection,
g_variant_get (parameters, "((sss))", &mmsc,
&mmsproxy,
&mmsapn);
DBG("ModemManagerPlugin(): args MMSC:%s MMS Proxy:%s MMS APN:%s", mmsc, mmsproxy, mmsapn);
dbus_settings_changed = TRUE;
DBG("ModemManagerPlugin(): args MMSC:%s MMS Proxy:%s MMS APN:%s", mmsc, mmsproxy, mmsapn);
modem->modemsettings = mms_settings_open(IDENTIFIER, SETTINGS_STORE);
if (g_strcmp0(mmsc, "") != 0) {
......@@ -795,12 +792,7 @@ static int set_context (void) {
mms_error("ModemManagerPlugin(): The MMSC is not configured! Please configure the MMSC and restart mmsd.");
return MMSD_MM_MODEM_MMSC_MISCONFIGURED;
}
if (dbus_settings_changed) {
mms_error("ModemManagerPlugin(): You changed the MMSC, MMSProxy, and/or the MMS APN via dbus, but did not restart mmsd. Please restart mmsd.");
return MMSD_MM_MODEM_DBUS_SETTINGS_CHANGED;
}
return MMSD_MM_MODEM_CONTEXT_ACTIVE;
}
......@@ -841,7 +833,6 @@ static int modemmanager_init(void)
g_autoptr(GError) error = NULL;
/* Set up modem Structure to be used here */
modem = g_try_new0(struct modem_data, 1);
dbus_settings_changed = FALSE;
if (modem == NULL) {
mms_error("ModemManagerPlugin(): Could not allocate space for modem data!");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment