1
=== modified file 'debian/control'
2
--- debian/control	2015-05-08 20:48:08 +0000
3
+++ debian/control	2015-06-03 18:56:24 +0000
4
@@ -36,7 +36,7 @@
5
36
 real phone calls and send and receive SMSs.
36
 real phone calls and send and receive SMSs.
6
37
37
7
38
Package: telepathy-ofono-ril-mc-plugin
38
Package: telepathy-ofono-ril-mc-plugin
9
39
Architecture: any
39
Architecture: amd64 i386 armhf
10
40
Depends: telepathy-ofono,
40
Depends: telepathy-ofono,
11
41
         ${misc:Depends},
41
         ${misc:Depends},
12
42
         ${shlibs:Depends},
42
         ${shlibs:Depends},
13
43
43
14
=== modified file 'mc-plugin/mcp-account-manager-ofono.c'
15
--- mc-plugin/mcp-account-manager-ofono.c	2015-05-19 14:32:02 +0000
16
+++ mc-plugin/mcp-account-manager-ofono.c	2015-06-03 18:56:24 +0000
17
@@ -21,8 +21,11 @@
18
21
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
21
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
19
22
 */
22
 */
20
23
23
21
24
#include <libintl.h>
22
25
#include <locale.h>
23
24
#include <string.h>
26
#include <string.h>
24
25
#include <stdio.h>
27
#include <stdio.h>
25
28
#include <malloc.h>
26
26
#include "mcp-account-manager-ofono.h"
29
#include "mcp-account-manager-ofono.h"
27
27
30
28
28
#define PLUGIN_NAME "ofono-account"
31
#define PLUGIN_NAME "ofono-account"
29
@@ -74,6 +77,7 @@
30
74
    int            num_modems = 0;
77
    int            num_modems = 0;
31
75
    int index;
78
    int index;
32
76
79
33
80
    setlocale(LC_ALL, "");
34
77
    self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCP_TYPE_ACCOUNT_MANAGER_OFONO,
81
    self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCP_TYPE_ACCOUNT_MANAGER_OFONO,
35
78
            McpAccountManagerOfonoPrivate);
82
            McpAccountManagerOfonoPrivate);
36
79
83
37
@@ -127,16 +131,43 @@
38
127
            if (sim_names) {
131
            if (sim_names) {
39
128
                GVariantIter iter;
132
                GVariantIter iter;
40
129
                GVariant *value;
133
                GVariant *value;
41
134
                GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE("a(ss)"));
42
130
                gchar *key;
135
                gchar *key;
43
136
                int found = 0;
44
131
137
45
132
                g_variant_iter_init (&iter, sim_names);
138
                g_variant_iter_init (&iter, sim_names);
46
133
                while (g_variant_iter_next (&iter, "{ss}", &key, &value)) {
139
                while (g_variant_iter_next (&iter, "{ss}", &key, &value)) {
47
140
                    g_variant_builder_add(builder, "(ss)", key, value);
48
134
                    if (!strcmp(key, ril_modem)) {
141
                    if (!strcmp(key, ril_modem)) {
49
135
                        g_hash_table_insert(account->params, g_strdup("DisplayName"), g_strdup((char *)value));
142
                        g_hash_table_insert(account->params, g_strdup("DisplayName"), g_strdup((char *)value));
50
143
                        found = 1;
51
136
                    }
144
                    }
52
137
                    g_free (key);
145
                    g_free (key);
53
138
                    g_free (value);
146
                    g_free (value);
54
139
                }
147
                }
55
148
                if (!found) {
56
149
                    char *sim_name = dgettext("telephony-service", "SIM %1");
57
150
                    char *final_sim_name = NULL;
58
151
                    char sim_index[10] = {0};
59
152
                    const char *placeholder = "%1";
60
153
                    sprintf(sim_index, "%d", index+1);
61
154
                    const char *pos = strstr(sim_name, placeholder);
62
155
                    if (pos) {
63
156
                        // this is used to replace %1 by the actual index
64
157
                        // FIXME: change telephony-service's string to %d to make everything easier
65
158
                        final_sim_name = calloc(1, strlen(sim_name) - strlen(placeholder) + strlen(sim_index) + 1);
66
159
                        strncpy(final_sim_name, sim_name, pos - sim_name);
67
160
                        strcat(final_sim_name, sim_index);
68
161
                        strcat(final_sim_name, pos + strlen(placeholder));
69
162
                    } else {
70
163
                        final_sim_name = strdup(sim_name);
71
164
                    }
72
165
                    
73
166
                    g_hash_table_insert(account->params, g_strdup("DisplayName"), g_strdup(final_sim_name));
74
167
                    g_settings_set_value(settings, "sim-names", g_variant_new("a(ss)", builder));
75
168
                    free(final_sim_name);
76
169
                }
77
170
                g_variant_builder_unref(builder);
78
140
            }
171
            }
79
141
            if (sim_names) {
172
            if (sim_names) {
80
142
                g_variant_unref(sim_names);
173
                g_variant_unref(sim_names);
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2015-06-01	Approve on 2015-06-02
PS Jenkins bot	continuous-integration		Approve on 2015-06-02
Review via email: mp+260777@code.launchpad.net