~modemmanager/network-manager/ubuntu.0.7.1.mm : revision 46

1

diff --git a/callouts/Makefile.am b/callouts/Makefile.am

2

index 18a7ac6..b302c54 100644

3

--- a/callouts/Makefile.am

4

+++ b/callouts/Makefile.am

5

@@ -65,16 +65,6 @@ nm_dispatcher_action_LDADD = \

1

---

2

callouts/Makefile.am | 10

3

configure.in | 1

4

src/Makefile.am | 23

5

src/NetworkManagerPolicy.c | 7

6

src/NetworkManagerUtils.c | 155 ++--

7

src/NetworkManagerUtils.h | 20

8

src/modem-manager/Makefile.am | 41 +

9

src/modem-manager/nm-modem-cdma.c | 209 ++++++

10

src/modem-manager/nm-modem-cdma.h | 36 +

11

src/modem-manager/nm-modem-gsm.c | 342 ++++++++++

12

src/modem-manager/nm-modem-gsm.h | 37 +

13

src/modem-manager/nm-modem-manager.c | 403 +++++++++++

14

src/modem-manager/nm-modem-manager.h | 35 +

15

src/modem-manager/nm-modem-types.h | 93 ++

16

src/modem-manager/nm-modem.c | 639 ++++++++++++++++++

17

src/modem-manager/nm-modem.h | 50 +

18

src/nm-cdma-device.c | 591 -----------------

19

src/nm-cdma-device.h | 59 -

20

src/nm-device.c | 3

21

src/nm-hal-manager.c | 728 ---------------------

22

src/nm-hso-gsm-device.c | 611 ------------------

23

src/nm-hso-gsm-device.h | 56 -

24

src/nm-manager.c | 150 ++--

25

src/nm-serial-device.c | 1180 -----------------------------------

26

src/nm-serial-device.h | 110 ---

27

25 files changed, 2088 insertions(+), 3501 deletions(-)

28

29

Index: network-manager-0.7.1~rc4.1.cf199a964/callouts/Makefile.am

30

===================================================================

31

--- network-manager-0.7.1~rc4.1.cf199a964.orig/callouts/Makefile.am

32

+++ network-manager-0.7.1~rc4.1.cf199a964/callouts/Makefile.am

33

@@ -60,26 +60,16 @@

34

$(DBUS_LIBS) \

35

$(GLIB_LIBS) \

36

$(top_builddir)/libnm-glib/libnm_glib.la \

37

$(top_builddir)/libnm-util/libnm-util.la

38

6

39

nm-dispatcher-glue.h: nm-dispatcher.xml

7

40

dbus-binding-tool --prefix=nm_dispatcher --mode=glib-server --output=$@ $<

8

41

19

52

dbusactivationdir = $(datadir)/dbus-1/system-services

20

53

dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in

21

54

dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)

22

diff --git a/configure.in b/configure.in

23

index a3588e2..619fa4d 100644

24

--- a/configure.in

25

+++ b/configure.in

26

@@ -488,6 +488,7 @@ src/dhcp-manager/Makefile

55

56

%.service: %.service.in

57

$(edit) $< >$@

58

59

edit = @sed \

60

Index: network-manager-0.7.1~rc4.1.cf199a964/configure.in

61

===================================================================

62

--- network-manager-0.7.1~rc4.1.cf199a964.orig/configure.in

63

+++ network-manager-0.7.1~rc4.1.cf199a964/configure.in

64

@@ -484,16 +484,17 @@

65

src/tests/Makefile

66

marshallers/Makefile

67

src/named-manager/Makefile

68

src/vpn-manager/Makefile

69

src/dhcp-manager/Makefile

27

70

src/supplicant-manager/Makefile

28

71

src/ppp-manager/Makefile

29

72

src/dnsmasq-manager/Makefile

31

74

src/backends/Makefile

32

75

libnm-util/libnm-util.pc

33

76

libnm-util/Makefile

34

diff --git a/src/Makefile.am b/src/Makefile.am

35

index 44911ab..514a581 100644

36

--- a/src/Makefile.am

37

+++ b/src/Makefile.am

38

@@ -6,6 +6,7 @@ SUBDIRS= \

77

libnm-util/tests/Makefile

78

libnm-util/tests/certs/Makefile

79

libnm-glib/libnm_glib.pc

80

libnm-glib/libnm_glib_vpn.pc

81

libnm-glib/Makefile

82

Index: network-manager-0.7.1~rc4.1.cf199a964/src/Makefile.am

83

===================================================================

84

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/Makefile.am

85

+++ network-manager-0.7.1~rc4.1.cf199a964/src/Makefile.am

86

@@ -1,27 +1,29 @@

87

SUBDIRS= \

88

named-manager \

89

vpn-manager \

90

dhcp-manager \

91

supplicant-manager \

39

92

ppp-manager \

40

93

backends \

41

94

dnsmasq-manager \

43

96

. \

44

97

tests

45

98

46

@@ -17,6 +18,7 @@ INCLUDES = -I${top_srcdir} \

99

INCLUDES = -I${top_srcdir} \

100

-I${top_srcdir}/include \

101

-I${top_builddir}/marshallers \

102

-I${top_srcdir}/src/named-manager \

103

-I${top_srcdir}/src/vpn-manager \

47

104

-I${top_srcdir}/src/dhcp-manager \

48

105

-I${top_srcdir}/src/supplicant-manager \

49

106

-I${top_srcdir}/src/dnsmasq-manager \

51

108

-I${top_srcdir}/libnm-util \

52

109

-I${top_srcdir}/callouts

53

110

54

@@ -87,14 +89,6 @@ NetworkManager_SOURCES = \

111

###########################################

112

# DHCP test library

113

###########################################

114

115

noinst_LTLIBRARIES = libtest-dhcp.la

116

@@ -82,24 +84,16 @@

117

nm-manager.c \

118

nm-manager.h \

119

nm-netlink-monitor.c \

120

nm-netlink-monitor.h \

121

nm-activation-request.c \

55

122

nm-activation-request.h \

56

123

nm-properties-changed-signal.c \

57

124

nm-properties-changed-signal.h \

66

133

wpa.c \

67

134

wpa.h \

68

135

nm-netlink.c \

69

@@ -117,15 +111,6 @@ nm-device-ethernet-glue.h: $(top_srcdir)/introspection/nm-device-ethernet.xml

136

nm-netlink.h \

137

nm-dhcp4-config.c \

138

nm-dhcp4-config.h

139

140

nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml

141

@@ -112,43 +106,31 @@

142

dbus-binding-tool --prefix=nm_device_interface --mode=glib-server --output=$@ $<

143

144

nm-device-ethernet-glue.h: $(top_srcdir)/introspection/nm-device-ethernet.xml

145

dbus-binding-tool --prefix=nm_device_ethernet --mode=glib-server --output=$@ $<

146

70

147

nm-device-wifi-glue.h: $(top_srcdir)/introspection/nm-device-wifi.xml

71

148

dbus-binding-tool --prefix=nm_device_wifi --mode=glib-server --output=$@ $<

72

149

82

159

nm-ip4-config-glue.h: $(top_srcdir)/introspection/nm-ip4-config.xml

83

160

dbus-binding-tool --prefix=nm_ip4_config --mode=glib-server --output=$@ $<

84

161

85

@@ -141,9 +126,6 @@ BUILT_SOURCES = \

162

nm-active-connection-glue.h: $(top_srcdir)/introspection/nm-active-connection.xml

163

dbus-binding-tool --prefix=nm_active_connection --mode=glib-server --output=$@ $<

164

165

nm-dhcp4-config-glue.h: $(top_srcdir)/introspection/nm-dhcp4-config.xml

166

dbus-binding-tool --prefix=nm_dhcp4_config --mode=glib-server --output=$@ $<

167

168

BUILT_SOURCES = \

169

nm-access-point-glue.h \

170

nm-manager-glue.h \

86

171

nm-device-interface-glue.h \

87

172

nm-device-ethernet-glue.h \

88

173

nm-device-wifi-glue.h \

92

177

nm-ip4-config-glue.h \

93

178

nm-active-connection-glue.h \

94

179

nm-dhcp4-config-glue.h

95

@@ -180,6 +162,7 @@ NetworkManager_LDADD = \

180

181

NetworkManager_CPPFLAGS = \

182

$(DBUS_CFLAGS) \

183

$(GLIB_CFLAGS) \

184

$(HAL_CFLAGS) \

185

@@ -175,16 +157,17 @@

186

$(LIBUDEV_LIBS) \

187

$(top_builddir)/marshallers/libmarshallers.la \

188

./named-manager/libnamed-manager.la \

189

./vpn-manager/libvpn-manager.la \

190

./dhcp-manager/libdhcp-manager.la \

96

191

./supplicant-manager/libsupplicant-manager.la \

97

192

./dnsmasq-manager/libdnsmasq-manager.la \

98

193

./ppp-manager/libppp-manager.la \

100

195

./backends/libnmbackend.la \

101

196

$(top_builddir)/libnm-util/libnm-util.la

102

197

103

diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c

104

index 6bba92f..9d40025 100644

105

--- a/src/NetworkManagerPolicy.c

106

+++ b/src/NetworkManagerPolicy.c

107

@@ -34,15 +34,13 @@

198

NetworkManager_LDFLAGS = -rdynamic

199

200

libexec_PROGRAMS = nm-crash-logger

201

nm_crash_logger_SOURCES = nm-crash-logger.c

202

nm_crash_logger_CPPFLAGS = \

203

Index: network-manager-0.7.1~rc4.1.cf199a964/src/NetworkManagerPolicy.c

204

===================================================================

205

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/NetworkManagerPolicy.c

206

+++ network-manager-0.7.1~rc4.1.cf199a964/src/NetworkManagerPolicy.c

207

@@ -29,25 +29,23 @@

208

#include "NetworkManagerUtils.h"

209

#include "NetworkManagerAP.h"

210

#include "nm-activation-request.h"

211

#include "nm-utils.h"

212

#include "nm-device-interface.h"

108

213

#include "nm-device.h"

109

214

#include "nm-device-wifi.h"

110

215

#include "nm-device-ethernet.h"

121

226

122

227

typedef struct LookupThread LookupThread;

123

228

124

@@ -234,8 +232,7 @@ get_best_device (NMManager *manager, NMActRequest **out_req)

229

typedef void (*LookupCallback) (LookupThread *thread, gpointer user_data);

230

231

struct LookupThread {

232

GThread *thread;

233

234

@@ -229,18 +227,17 @@

235

236

addr = nm_ip4_config_get_address (ip4_config, i);

237

if (nm_ip4_address_get_gateway (addr)) {

238

can_default = TRUE;

239

break;

125

240

}

126

241

}

127

242

131

246

continue;

132

247

133

248

/* 'never-default' devices can't ever be the default */

134

diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c

135

index 519e57d..1e3d328 100644

136

--- a/src/NetworkManagerUtils.c

137

+++ b/src/NetworkManagerUtils.c

138

@@ -345,48 +345,6 @@ nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting)

249

if (s_ip4 && nm_setting_ip4_config_get_never_default (s_ip4))

250

continue;

251

252

prio = nm_device_get_priority (dev);

253

if (prio > 0 && prio < best_prio) {

254

Index: network-manager-0.7.1~rc4.1.cf199a964/src/NetworkManagerUtils.c

255

===================================================================

256

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/NetworkManagerUtils.c

257

+++ network-manager-0.7.1~rc4.1.cf199a964/src/NetworkManagerUtils.c

258

@@ -340,58 +340,16 @@

259

if (j == num)

260

nm_ip4_config_add_route (ip4_config, setting_route);

261

}

262

263

if (nm_setting_ip4_config_get_never_default (setting))

139

264

nm_ip4_config_set_never_default (ip4_config, TRUE);

140

265

}

141

266

184

309

void

185

310

nm_utils_call_dispatcher (const char *action,

186

311

NMConnection *connection,

187

@@ -421,57 +379,48 @@ nm_utils_call_dispatcher (const char *action,

312

NMDevice *device,

313

const char *vpn_iface)

314

{

315

NMDBusManager *dbus_mgr;

316

DBusGProxy *proxy;

317

@@ -416,75 +374,132 @@

318

nm_warning ("Error: could not get dispatcher proxy!");

319

g_object_unref (dbus_mgr);

320

return;

321

}

322

188

323

if (connection) {

189

324

connection_hash = nm_connection_to_hash (connection);

190

325

261

396

}

262

397

263

398

dbus_g_proxy_call_no_reply (proxy, "Action",

264

@@ -488,3 +437,69 @@ nm_utils_call_dispatcher (const char *action,

399

G_TYPE_STRING, action,

400

DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, connection_hash,

401

DBUS_TYPE_G_MAP_OF_VARIANT, connection_props,

402

DBUS_TYPE_G_MAP_OF_VARIANT, device_props,

403

G_TYPE_INVALID);

404

405

g_object_unref (proxy);

406

g_hash_table_destroy (connection_hash);

407

g_hash_table_destroy (connection_props);

408

g_hash_table_destroy (device_props);

265

409

g_object_unref (dbus_mgr);

266

410

}

267

411

331

475

+

332

476

+ value_hash_add (hash, key, value);

333

477

+}

334

diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h

335

index 147a972..437bf2e 100644

336

--- a/src/NetworkManagerUtils.h

337

+++ b/src/NetworkManagerUtils.h

338

@@ -48,5 +48,23 @@ void nm_utils_call_dispatcher (const char *action,

478

Index: network-manager-0.7.1~rc4.1.cf199a964/src/NetworkManagerUtils.h

479

===================================================================

480

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/NetworkManagerUtils.h

481

+++ network-manager-0.7.1~rc4.1.cf199a964/src/NetworkManagerUtils.h

482

@@ -43,10 +43,28 @@

483

484

void nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting);

485

486

void nm_utils_call_dispatcher (const char *action,

487

NMConnection *connection,

339

488

NMDevice *device,

340

489

const char *vpn_iface);

341

490

360

509

+

361

510

+

362

511

+#endif /* NETWORK_MANAGER_UTILS_H */

363

diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am

364

new file mode 100644

365

index 0000000..5b660d0

512

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/Makefile.am

513

===================================================================

366

514

--- /dev/null

367

+++ b/src/modem-manager/Makefile.am

515

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/Makefile.am

368

516

@@ -0,0 +1,41 @@

369

517

+INCLUDES = \

370

518

+ -I${top_srcdir}/src \

407

555

+ nm-serial-device-glue.h

408

556

+

409

557

+CLEANFILES = $(BUILT_SOURCES)

410

diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c

411

new file mode 100644

412

index 0000000..18d28c0

558

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-cdma.c

559

===================================================================

413

560

--- /dev/null

414

+++ b/src/modem-manager/nm-modem-cdma.c

561

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-cdma.c

415

562

@@ -0,0 +1,209 @@

416

563

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

417

564

+

622

769

+ dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),

623

770

+ &dbus_glib_nm_device_cdma_object_info);

624

771

+}

625

diff --git a/src/modem-manager/nm-modem-cdma.h b/src/modem-manager/nm-modem-cdma.h

626

new file mode 100644

627

index 0000000..a1f3bf5

772

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-cdma.h

773

===================================================================

628

774

--- /dev/null

629

+++ b/src/modem-manager/nm-modem-cdma.h

775

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-cdma.h

630

776

@@ -0,0 +1,36 @@

631

777

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

632

778

+

664

810

+G_END_DECLS

665

811

+

666

812

+#endif /* NM_MODEM_CDMA_H */

667

diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c

668

new file mode 100644

669

index 0000000..81a56bb

813

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-gsm.c

814

===================================================================

670

815

--- /dev/null

671

+++ b/src/modem-manager/nm-modem-gsm.c

816

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-gsm.c

672

817

@@ -0,0 +1,342 @@

673

818

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

674

819

+

1012

1157

+ dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),

1013

1158

+ &dbus_glib_nm_device_gsm_object_info);

1014

1159

+}

1015

diff --git a/src/modem-manager/nm-modem-gsm.h b/src/modem-manager/nm-modem-gsm.h

1016

new file mode 100644

1017

index 0000000..75e6e18

1160

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-gsm.h

1161

===================================================================

1018

1162

--- /dev/null

1019

+++ b/src/modem-manager/nm-modem-gsm.h

1163

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-gsm.h

1020

1164

@@ -0,0 +1,37 @@

1021

1165

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

1022

1166

+

1055

1199

+G_END_DECLS

1056

1200

+

1057

1201

+#endif /* NM_MODEM_GSM_H */

1058

diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c

1059

new file mode 100644

1060

index 0000000..4c13f85

1202

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-manager.c

1203

===================================================================

1061

1204

--- /dev/null

1062

+++ b/src/modem-manager/nm-modem-manager.c

1205

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-manager.c

1063

1206

@@ -0,0 +1,403 @@

1064

1207

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

1065

1208

+

1464

1607

+ G_TYPE_NONE, 1,

1465

1608

+ G_TYPE_OBJECT);

1466

1609

+}

1467

diff --git a/src/modem-manager/nm-modem-manager.h b/src/modem-manager/nm-modem-manager.h

1468

new file mode 100644

1469

index 0000000..fb51f73

1610

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-manager.h

1611

===================================================================

1470

1612

--- /dev/null

1471

+++ b/src/modem-manager/nm-modem-manager.h

1613

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-manager.h

1472

1614

@@ -0,0 +1,35 @@

1473

1615

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

1474

1616

+

1505

1647

+NMModemManager *nm_modem_manager_get (void);

1506

1648

+

1507

1649

+#endif /* NM_MODEM_MANAGER_H */

1508

diff --git a/src/modem-manager/nm-modem-types.h b/src/modem-manager/nm-modem-types.h

1509

new file mode 100644

1510

index 0000000..a251d2a

1650

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-types.h

1651

===================================================================

1511

1652

--- /dev/null

1512

+++ b/src/modem-manager/nm-modem-types.h

1653

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem-types.h

1513

1654

@@ -0,0 +1,93 @@

1514

1655

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

1515

1656

+

1604

1745

+#define MM_MODEM_ERROR_GPRS_INVALID_CLASS MM_MODEM_ERROR ".GprsInvalidClass"

1605

1746

+

1606

1747

+#endif /* NM_MODEM_TYPES_H */

1607

diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c

1608

new file mode 100644

1609

index 0000000..3b460fd

1748

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem.c

1749

===================================================================

1610

1750

--- /dev/null

1611

+++ b/src/modem-manager/nm-modem.c

1751

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem.c

1612

1752

@@ -0,0 +1,639 @@

1613

1753

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

1614

1754

+

2249

2389

+ dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),

2250

2390

+ &dbus_glib_nm_serial_device_object_info);

2251

2391

+}

2252

diff --git a/src/modem-manager/nm-modem.h b/src/modem-manager/nm-modem.h

2253

new file mode 100644

2254

index 0000000..ded97df

2392

Index: network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem.h

2393

===================================================================

2255

2394

--- /dev/null

2256

+++ b/src/modem-manager/nm-modem.h

2395

+++ network-manager-0.7.1~rc4.1.cf199a964/src/modem-manager/nm-modem.h

2257

2396

@@ -0,0 +1,50 @@

2258

2397

+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

2259

2398

+

2305

2444

+G_END_DECLS

2306

2445

+

2307

2446

+#endif /* NM_MODEM_H */

2308

diff --git a/src/nm-cdma-device.c b/src/nm-cdma-device.c

2309

deleted file mode 100644

2310

index 1ca3dad..0000000

2311

--- a/src/nm-cdma-device.c

2447

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-cdma-device.c

2448

===================================================================

2449

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-cdma-device.c

2312

2450

+++ /dev/null

2313

2451

@@ -1,591 +0,0 @@

2314

2452

-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

2902

3040

- dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),

2903

3041

- &dbus_glib_nm_cdma_device_object_info);

2904

3042

-}

2905

diff --git a/src/nm-cdma-device.h b/src/nm-cdma-device.h

2906

deleted file mode 100644

2907

index 50c44a3..0000000

2908

--- a/src/nm-cdma-device.h

3043

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-cdma-device.h

3044

===================================================================

3045

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-cdma-device.h

2909

3046

+++ /dev/null

2910

3047

@@ -1,59 +0,0 @@

2911

3048

-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

2967

3104

-G_END_DECLS

2968

3105

-

2969

3106

-#endif /* NM_CDMA_DEVICE_H */

2970

diff --git a/src/nm-device.c b/src/nm-device.c

2971

index 1ea77b2..c1c7d36 100644

2972

--- a/src/nm-device.c

2973

+++ b/src/nm-device.c

2974

@@ -887,6 +887,9 @@ real_act_stage3_ip_config_start (NMDevice *self, NMDeviceStateReason *reason)

3107

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-device.c

3108

===================================================================

3109

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-device.c

3110

+++ network-manager-0.7.1~rc4.1.cf199a964/src/nm-device.c

3111

@@ -879,16 +879,19 @@

3112

3113

if (!s_ip4 || !method || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) {

3114

NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);

3115

gboolean success;

3116

2975

3117

/* Begin a DHCP transaction on the interface */

2976

3118

nm_device_set_use_dhcp (self, TRUE);

2977

3119

2981

3123

/* DHCP manager will cancel any transaction already in progress and we do not

2982

3124

want to cancel this activation if we get "down" state from that. */

2983

3125

g_signal_handler_block (priv->dhcp_manager, priv->dhcp_state_sigid);

2984

diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c

2985

index 647fe21..2e72291 100644

2986

--- a/src/nm-hal-manager.c

2987

+++ b/src/nm-hal-manager.c

2988

@@ -41,9 +41,6 @@

3126

success = nm_dhcp_manager_begin_transaction (priv->dhcp_manager, ip_iface, s_ip4, 45);

3127

g_signal_handler_unblock (priv->dhcp_manager, priv->dhcp_state_sigid);

3128

3129

if (success) {

3130

/* DHCP devices will be notified by the DHCP manager when

3131

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-hal-manager.c

3132

===================================================================

3133

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-hal-manager.c

3134

+++ network-manager-0.7.1~rc4.1.cf199a964/src/nm-hal-manager.c

3135

@@ -36,19 +36,16 @@

3136

3137

#include "nm-glib-compat.h"

3138

#include "nm-hal-manager.h"

3139

#include "nm-marshal.h"

3140

#include "nm-dbus-manager.h"

2989

3141

#include "nm-utils.h"

2990

3142

#include "nm-device-wifi.h"

2991

3143

#include "nm-device-ethernet.h"

2995

3147

2996

3148

/* Killswitch poll frequency in seconds */

2997

3149

#define RFKILL_POLL_FREQUENCY 6

2998

@@ -66,10 +63,6 @@ typedef struct {

3150

3151

#define HAL_DBUS_SERVICE "org.freedesktop.Hal"

3152

3153

typedef struct {

3154

GType device_type;

3155

@@ -61,20 +58,16 @@

3156

static void emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator);

3157

3158

typedef struct {

3159

LibHalContext *hal_ctx;

3160

NMDBusManager *dbus_mgr;

2999

3161

GSList *device_creators;

3000

3162

gboolean rfkilled; /* Authoritative rfkill state */

3001

3163

3006

3168

/* Killswitch handling */

3007

3169

GSList *killswitch_list;

3008

3170

guint32 killswitch_poll_id;

3009

@@ -270,736 +263,6 @@ wireless_device_creator (NMHalManager *self,

3171

char *kswitch_err;

3172

gboolean poll_rfkilled;

3173

guint32 pending_polls;

3174

GSList *poll_proxies;

3175

3176

@@ -265,713 +258,16 @@

3177

device = (GObject *) nm_device_wifi_new (udi, iface, driver, managed);

3178

3179

libhal_free_string (iface);

3180

g_free (driver);

3181

3010

3182

return device;

3011

3183

}

3012

3184

3034

3206

-static char *

3035

3207

-get_hso_netdev (LibHalContext *ctx, const char *udi)

3036

3208

-{

3037

- char *serial_od = NULL, *serial_od_parent = NULL, *netdev = NULL, *bus;

3038

- char **netdevs = NULL;

3209

- char *serial_parent, *netdev = NULL;

3210

- char **netdevs;

3039

3211

- int num, i;

3040

3212

-

3041

3213

- /* Get the serial interface's originating device UDI, used to find the

3042

3214

- * originating device's netdev.

3043

3215

- */

3044

- serial_od = libhal_device_get_property_string (ctx, udi, "serial.originating_device", NULL);

3045

- if (!serial_od)

3046

- serial_od = libhal_device_get_property_string (ctx, udi, "serial.physical_device", NULL);

3047

- if (!serial_od)

3048

- goto out;

3049

-

3050

- serial_od_parent = libhal_device_get_property_string (ctx, serial_od, "info.parent", NULL);

3051

- if (!serial_od_parent)

3052

- goto out;

3053

-

3054

- /* Check to ensure we've got the actual "USB Device" */

3055

- bus = libhal_device_get_property_string (ctx, serial_od_parent, "info.bus", NULL);

3056

- if (!bus || strcmp (bus, "usb_device")) {

3057

- libhal_free_string (bus);

3058

- goto out;

3059

- }

3060

- libhal_free_string (bus);

3216

- serial_parent = libhal_device_get_property_string (ctx, udi, "serial.originating_device", NULL);

3217

- if (!serial_parent)

3218

- serial_parent = libhal_device_get_property_string (ctx, udi, "info.parent", NULL);

3219

- if (!serial_parent)

3220

- return NULL;

3061

3221

-

3062

3222

- /* Look for the originating device's netdev */

3063

3223

- netdevs = libhal_find_device_by_capability (ctx, "net", &num, NULL);

3064

3224

- for (i = 0; netdevs && !netdev && (i < num); i++) {

3065

- char *net_od = NULL, *net_od_parent = NULL, *tmp;

3066

-

3067

- net_od = libhal_device_get_property_string (ctx, netdevs[i], "net.originating_device", NULL);

3068

- if (!net_od)

3069

- net_od = libhal_device_get_property_string (ctx, netdevs[i], "net.physical_device", NULL);

3070

- if (!net_od)

3071

- goto next;

3072

-

3073

- net_od_parent = libhal_device_get_property_string (ctx, net_od, "info.parent", NULL);

3074

- if (!net_od_parent)

3075

- goto next;

3076

-

3077

- /* Check to ensure we've got the actual "USB Device" */

3078

- bus = libhal_device_get_property_string (ctx, net_od_parent, "info.bus", NULL);

3079

- if (!bus || strcmp (bus, "usb_device")) {

3080

- libhal_free_string (bus);

3081

- goto next;

3082

- }

3083

- libhal_free_string (bus);

3084

-

3085

- if (!strcmp (net_od_parent, serial_od_parent)) {

3225

- char *netdev_parent, *tmp;

3226

-

3227

- netdev_parent = libhal_device_get_property_string (ctx, netdevs[i], "net.originating_device", NULL);

3228

- if (!netdev_parent)

3229

- netdev_parent = libhal_device_get_property_string (ctx, netdevs[i], "net.physical_device", NULL);

3230

- if (!netdev_parent)

3231

- continue;

3232

-

3233

- if (!strcmp (netdev_parent, serial_parent)) {

3086

3234

- /* We found it */

3087

3235

- tmp = libhal_device_get_property_string (ctx, netdevs[i], "net.interface", NULL);

3088

- if (tmp)

3236

- if (tmp) {

3089

3237

- netdev = g_strdup (tmp);

3090

- libhal_free_string (tmp);

3238

- libhal_free_string (tmp);

3239

- }

3091

3240

- }

3092

3241

-

3093

- next:

3094

- libhal_free_string (net_od_parent);

3095

- libhal_free_string (net_od);

3242

- libhal_free_string (netdev_parent);

3096

3243

- }

3097

-

3098

-out:

3099

3244

- libhal_free_string_array (netdevs);

3100

- libhal_free_string (serial_od);

3101

- libhal_free_string (serial_od_parent);

3245

- libhal_free_string (serial_parent);

3102

3246

-

3103

3247

- return netdev;

3104

3248

-}

3531

3675

- }

3532

3676

-

3533

3677

- netdev = get_hso_netdev (ctx, udi);

3534

- if (!netdev) {

3535

- nm_warning ("couldn't find HSO modem network device.");

3536

- return NULL;

3537

- }

3538

3678

- }

3539

3679

-

3540

3680

- /* Special handling of Option cards (until punted to ModemManager). Only

3575

3715

- }

3576

3716

- }

3577

3717

-

3578

- if (gsm && netdev) {

3718

- if (gsm && netdev)

3579

3719

- device = (GObject *) nm_hso_gsm_device_new (udi, ttyname, NULL, netdev, driver, managed);

3580

- g_free (netdev);

3581

- } else if (gsm)

3720

- else if (gsm)

3582

3721

- device = (GObject *) nm_gsm_device_new (udi, ttyname, NULL, driver, managed);

3583

3722

- else if (cdma)

3584

3723

- device = (GObject *) nm_cdma_device_new (udi, ttyname, NULL, driver, managed);

3743

3882

static void

3744

3883

register_built_in_creators (NMHalManager *self)

3745

3884

{

3746

@@ -1023,16 +286,6 @@ register_built_in_creators (NMHalManager *self)

3885

NMHalManagerPrivate *priv = NM_HAL_MANAGER_GET_PRIVATE (self);

3886

DeviceCreator *creator;

3887

3888

/* Wired device */

3889

creator = g_slice_new0 (DeviceCreator);

3890

@@ -985,26 +281,16 @@

3891

/* Wireless device */

3892

creator = g_slice_new0 (DeviceCreator);

3893

creator->device_type = NM_TYPE_DEVICE_WIFI;

3894

creator->capability_str = g_strdup ("net.80211");

3895

creator->category = g_strdup ("net");

3747

3896

creator->is_device_fn = is_wireless_device;

3748

3897

creator->creator_fn = wireless_device_creator;

3749

3898

priv->device_creators = g_slist_append (priv->device_creators, creator);

3760

3909

}

3761

3910

3762

3911

static void

3763

@@ -1124,14 +377,6 @@ static void

3912

emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator)

3913

{

3914

NMHalManagerPrivate *priv = NM_HAL_MANAGER_GET_PRIVATE (self);

3915

char *od = NULL, *tmp, *parent, *bus = NULL;

3916

3917

@@ -1086,24 +372,16 @@

3918

if (creator)

3919

emit_udi_added (self, udi, creator);

3920

}

3921

3922

static void

3764

3923

device_removed (LibHalContext *ctx, const char *udi)

3765

3924

{

3766

3925

NMHalManager *self = NM_HAL_MANAGER (libhal_ctx_get_user_data (ctx));

3775

3934

g_signal_emit (self, signals[UDI_REMOVED], 0, udi);

3776

3935

}

3777

3936

3778

@@ -1574,12 +819,6 @@ dispose (GObject *object)

3937

static void

3938

device_new_capability (LibHalContext *ctx, const char *udi, const char *capability)

3939

{

3940

NMHalManager *self = NM_HAL_MANAGER (libhal_ctx_get_user_data (ctx));

3941

DeviceCreator *creator;

3942

@@ -1536,22 +814,16 @@

3943

}

3944

priv->disposed = TRUE;

3945

3946

g_object_unref (priv->dbus_mgr);

3947

3779

3948

g_slist_foreach (priv->device_creators, destroy_creator, NULL);

3780

3949

g_slist_free (priv->device_creators);

3781

3950

3788

3957

hal_deinit (self);

3789

3958

3790

3959

G_OBJECT_CLASS (nm_hal_manager_parent_class)->dispose (object);

3791

diff --git a/src/nm-hso-gsm-device.c b/src/nm-hso-gsm-device.c

3792

deleted file mode 100644

3793

index 1a00cf6..0000000

3794

--- a/src/nm-hso-gsm-device.c

3960

}

3961

3962

static void

3963

finalize (GObject *object)

3964

{

3965

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-hso-gsm-device.c

3966

===================================================================

3967

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-hso-gsm-device.c

3795

3968

+++ /dev/null

3796

3969

@@ -1,611 +0,0 @@

3797

3970

-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

4405

4578

- dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),

4406

4579

- &dbus_glib_nm_gsm_device_object_info);

4407

4580

-}

4408

diff --git a/src/nm-hso-gsm-device.h b/src/nm-hso-gsm-device.h

4409

deleted file mode 100644

4410

index 5b6b48a..0000000

4411

--- a/src/nm-hso-gsm-device.h

4581

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-hso-gsm-device.h

4582

===================================================================

4583

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-hso-gsm-device.h

4412

4584

+++ /dev/null

4413

4585

@@ -1,56 +0,0 @@

4414

4586

-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

4467

4639

-G_END_DECLS

4468

4640

-

4469

4641

-#endif /* NM_HSO_GSM_DEVICE_H */

4470

diff --git a/src/nm-manager.c b/src/nm-manager.c

4471

index 5621d86..78323c3 100644

4472

--- a/src/nm-manager.c

4473

+++ b/src/nm-manager.c

4474

@@ -29,11 +29,11 @@

4642

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-manager.c

4643

===================================================================

4644

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-manager.c

4645

+++ network-manager-0.7.1~rc4.1.cf199a964/src/nm-manager.c

4646

@@ -24,21 +24,21 @@

4647

#include <dbus/dbus-glib-lowlevel.h>

4648

#include <dbus/dbus-glib.h>

4649

4650

#include "nm-glib-compat.h"

4651

#include "nm-manager.h"

4475

4652

#include "nm-utils.h"

4476

4653

#include "nm-dbus-manager.h"

4477

4654

#include "nm-vpn-manager.h"

4484

4661

#include "NetworkManagerSystem.h"

4485

4662

#include "nm-properties-changed-signal.h"

4486

4663

#include "nm-setting-connection.h"

4487

@@ -99,6 +99,9 @@ static void system_settings_properties_changed_cb (DBusGProxy *proxy,

4664

#include "nm-setting-wireless.h"

4665

#include "nm-setting-vpn.h"

4666

#include "nm-marshal.h"

4667

#include "nm-dbus-glib-types.h"

4668

#include "nm-hal-manager.h"

4669

@@ -94,16 +94,19 @@

4670

4671

static void hal_manager_hal_reappeared_cb (NMHalManager *hal_mgr,

4672

gpointer user_data);

4673

4674

static void system_settings_properties_changed_cb (DBusGProxy *proxy,

4488

4675

GHashTable *properties,

4489

4676

gpointer user_data);

4490

4677

4494

4681

#define SSD_POKE_INTERVAL 120

4495

4682

#define ORIGDEV_TAG "originating-device"

4496

4683

4497

@@ -138,6 +141,10 @@ typedef struct {

4684

typedef struct {

4685

DBusGMethodInvocation *context;

4686

NMConnectionScope scope;

4687

char *connection_path;

4688

char *specific_object_path;

4689

@@ -133,16 +136,20 @@

4690

gboolean sleeping;

4691

4692

guint poke_id;

4693

guint sync_devices_id;

4694

4498

4695

NMVPNManager *vpn_manager;

4499

4696

guint vpn_manager_id;

4500

4697

4505

4702

DBusGProxy *aipd_proxy;

4506

4703

4507

4704

gboolean disposed;

4508

@@ -246,6 +253,36 @@ vpn_manager_connection_deactivated_cb (NMVPNManager *manager,

4705

} NMManagerPrivate;

4706

4707

#define NM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MANAGER, NMManagerPrivate))

4708

4709

G_DEFINE_TYPE (NMManager, nm_manager, G_TYPE_OBJECT)

4710

@@ -241,16 +248,46 @@

4711

NMVPNConnectionState state,

4712

NMVPNConnectionStateReason reason,

4713

gpointer user_data)

4714

{

4715

g_object_notify (G_OBJECT (user_data), NM_MANAGER_ACTIVE_CONNECTIONS);

4509

4716

}

4510

4717

4511

4718

static void

4542

4749

aipd_handle_event (DBusGProxy *proxy,

4543

4750

const char *event,

4544

4751

const char *iface,

4545

@@ -308,6 +345,12 @@ nm_manager_init (NMManager *manager)

4752

const char *address,

4753

gpointer user_data)

4754

{

4755

NMManager *manager = NM_MANAGER (user_data);

4756

NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);

4757

@@ -303,16 +340,22 @@

4758

g_free,

4759

g_object_unref);

4760

4761

priv->system_connections = g_hash_table_new_full (g_str_hash,

4762

g_str_equal,

4546

4763

g_free,

4547

4764

g_object_unref);

4548

4765

4555

4772

priv->vpn_manager = nm_vpn_manager_get ();

4556

4773

id = g_signal_connect (G_OBJECT (priv->vpn_manager), "connection-deactivated",

4557

4774

G_CALLBACK (vpn_manager_connection_deactivated_cb), manager);

4558

@@ -507,6 +550,16 @@ dispose (GObject *object)

4775

priv->vpn_manager_id = id;

4776

4777

g_connection = nm_dbus_manager_get_connection (priv->dbus_mgr);

4778

4779

/* avahi-autoipd stuff */

4780

@@ -502,16 +545,26 @@

4781

}

4782

4783

if (priv->vpn_manager_id) {

4784

g_source_remove (priv->vpn_manager_id);

4785

priv->vpn_manager_id = 0;

4559

4786

}

4560

4787

g_object_unref (priv->vpn_manager);

4561

4788

4572

4799

g_object_unref (priv->dbus_mgr);

4573

4800

g_object_unref (priv->hal_mgr);

4574

4801

4575

@@ -1160,20 +1213,6 @@ nm_manager_get_device_by_udi (NMManager *manager, const char *udi)

4802

G_OBJECT_CLASS (nm_manager_parent_class)->dispose (object);

4803

}

4804

4805

static void

4806

set_property (GObject *object, guint prop_id,

4807

@@ -1155,47 +1208,24 @@

4808

4809

for (iter = NM_MANAGER_GET_PRIVATE (manager)->devices; iter; iter = iter->next) {

4810

if (!strcmp (nm_device_get_udi (NM_DEVICE (iter->data)), udi))

4811

return NM_DEVICE (iter->data);

4812

}

4576

4813

return NULL;

4577

4814

}

4578

4815

4579

-static GSList *

4580

-nm_manager_get_devices_by_originating_device (NMManager *manager, const char *od)

4816

-static NMDevice *

4817

-nm_manager_get_device_by_originating_device (NMManager *manager, const char *od)

4581

4818

-{

4582

- GSList *iter, *devs = NULL;

4819

- GSList *iter;

4583

4820

-

4584

4821

- for (iter = NM_MANAGER_GET_PRIVATE (manager)->devices; iter; iter = iter->next) {

4585

4822

- const char *candidate_od = g_object_get_data (G_OBJECT (iter->data), ORIGDEV_TAG);

4586

4823

-

4587

4824

- if (candidate_od && !strcmp (candidate_od, od))

4588

- devs = g_slist_append (devs, G_OBJECT (iter->data));

4825

- return NM_DEVICE (iter->data);

4589

4826

- }

4590

- return devs;

4827

- return NULL;

4591

4828

-}

4592

4829

-

4593

4830

static const char *

4594

4831

nm_manager_get_originating_device (NMDevice *device)

4595

4832

{

4596

@@ -1182,15 +1221,6 @@ nm_manager_get_originating_device (NMDevice *device)

4833

g_return_val_if_fail (device != NULL, NULL);

4834

4597

4835

return (const char *) g_object_get_data (G_OBJECT (device), ORIGDEV_TAG);

4598

4836

}

4599

4837

4609

4847

static gboolean

4610

4848

nm_manager_udi_is_managed (NMManager *self, const char *udi)

4611

4849

{

4612

@@ -1682,61 +1712,25 @@ next:

4850

NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);

4851

GSList *iter;

4852

4853

for (iter = priv->unmanaged_udis; iter; iter = iter->next) {

4854

if (!strcmp (udi, iter->data))

4855

@@ -1677,89 +1707,87 @@

4856

4857

g_object_unref (connection);

4859

}

4860

g_slist_free (connections);

4613

4861

}

4614

4862

4615

4863

static void

4636

4884

-

4637

4885

- /* Ignore multiple ports for serial devices */

4638

4886

- if (general_type == NM_TYPE_SERIAL_DEVICE) {

4639

- GSList *devices, *iter;

4640

-

4641

- devices = nm_manager_get_devices_by_originating_device (self, originating_device);

4642

- for (iter = devices; iter; iter = g_slist_next (iter)) {

4643

- NMDevice *candidate = NM_DEVICE (iter->data);

4644

-

4645

- if (candidate && NM_IS_SERIAL_DEVICE (candidate)) {

4646

- g_slist_free (devices);

4647

- return;

4648

- }

4649

- }

4650

- g_slist_free (devices);

4887

- if (nm_manager_get_device_by_originating_device (self, originating_device))

4888

- return;

4651

4889

- }

4652

4890

-

4653

4891

- device = creator_fn (hal_mgr, udi, originating_device, nm_manager_udi_is_managed (self, udi));

4676

4914

4677

4915

/* Set initial rfkill state */

4678

4916

nm_device_wifi_set_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);

4679

@@ -1751,20 +1745,44 @@ hal_manager_udi_added_cb (NMHalManager *hal_mgr,

4917

}

4918

4919

iface = nm_device_get_iface (NM_DEVICE (device));

4920

driver = nm_device_get_driver (NM_DEVICE (device));

4921

if (!driver)

4922

driver = "unknown";

4923

4924

if (general_type == NM_TYPE_DEVICE_ETHERNET)

4680

4925

nm_info ("(%s): new Ethernet device (driver: '%s')", iface, driver);

4681

4926

else if (general_type == NM_TYPE_DEVICE_WIFI)

4682

4927

nm_info ("(%s): new 802.11 WiFi device (driver: '%s')", iface, driver);

4726

4971

hal_manager_udi_removed_cb (NMHalManager *manager,

4727

4972

const char *udi,

4728

4973

gpointer user_data)

4729

@@ -1785,6 +1803,8 @@ hal_manager_udi_removed_cb (NMHalManager *manager,

4974

{

4975

NMManager *self = NM_MANAGER (user_data);

4976

NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);

4977

GSList *keep = NULL, *gone = NULL, *iter;

4978

4979

@@ -1770,16 +1798,18 @@

4980

* emit the remove event for the same device (fdo #20703). But it's a

4981

* good bet that if an NMDevice's originating device got removed, then

4982

* the NMDevice itself got removed as well.

4983

*/

4984

for (iter = priv->devices; iter; iter = iter->next) {

4730

4985

NMDevice *device = NM_DEVICE (iter->data);

4731

4986

const char *origdev = nm_manager_get_originating_device (device);

4732

4987

4735

4990

if ( !strcmp (nm_device_get_udi (device), udi)

4736

4991

|| (origdev && !strcmp (udi, origdev)))

4737

4992

gone = g_slist_prepend (gone, device);

4738

diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c

4739

deleted file mode 100644

4740

index 1cba1ca..0000000

4741

--- a/src/nm-serial-device.c

4993

else

4994

keep = g_slist_append (keep, device);

4995

}

4996

g_slist_free (priv->devices);

4997

priv->devices = keep;

4998

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-serial-device.c

4999

===================================================================

5000

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-serial-device.c

4742

5001

+++ /dev/null

4743

5002

@@ -1,1180 +0,0 @@

4744

5003

-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */

5921

6180

- dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),

5922

6181

- &dbus_glib_nm_serial_device_object_info);

5923

6182

-}

5924

diff --git a/src/nm-serial-device.h b/src/nm-serial-device.h

5925

deleted file mode 100644

5926

index 6e9b53b..0000000

5927

--- a/src/nm-serial-device.h

6183

Index: network-manager-0.7.1~rc4.1.cf199a964/src/nm-serial-device.h

6184

===================================================================

6185

--- network-manager-0.7.1~rc4.1.cf199a964.orig/src/nm-serial-device.h

5928

6186

+++ /dev/null

5929

6187

@@ -1,110 +0,0 @@

5930

6188

-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */