← Back to branch summary

~ubuntu-branches/ubuntu/natty/bluedevil/natty

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_01_fix_obexdaemon_connect_crash.diff

  • Committer: Bazaar Package Importer
  • Author(s): Rohan Garg
  • Date: 2010-11-13 00:09:01 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20101113000901-prx5l5lhfj3j7rap
Tags: 1.0-0ubuntu1
https://launchpad.net/bugs/658728
* New upstream release
  - Drop kubuntu_01_fix_obexdaemon_connect_crash.diff, applied upstream
* Closes LP: #658728 "bluedevil translations not being used"

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_01_fix_obexdaemon_connect_crash.diff
1
 
Index: bluedevil-1.0~rc4/src/daemon/obexftpkded/ObexFtpDaemon.cpp
2
 
===================================================================
3
 
--- bluedevil-1.0~rc4.orig/src/daemon/obexftpkded/ObexFtpDaemon.cpp     2010-09-19 09:35:13.549921001 -0400
4
 
+++ bluedevil-1.0~rc4/src/daemon/obexftpkded/ObexFtpDaemon.cpp  2010-09-19 09:36:57.357921000 -0400
5
 
@@ -91,9 +91,6 @@
6
 
 
7
 
     qDBusRegisterMetaType<QStringMap>();
8
 
     qRegisterMetaType<QStringMap>("QStringMap");
9
 
-
10
 
-    connect(d->m_manager, SIGNAL(SessionConnected(QDBusObjectPath)), this, SLOT(SessionConnected(QDBusObjectPath)));
11
 
-    connect(d->m_manager, SIGNAL(SessionClosed(QDBusObjectPath)), this, SLOT(SessionClosed(QDBusObjectPath)));
12
 
 }
13
 
 
14
 
 ObexFtpDaemon::~ObexFtpDaemon()
15
 
@@ -113,6 +110,8 @@
16
 
     }
17
 
 
18
 
     d->m_manager = new org::openobex::Manager("org.openobex", "/org/openobex", QDBusConnection::sessionBus(), 0);
19
 
+    connect(d->m_manager, SIGNAL(SessionConnected(QDBusObjectPath)), this, SLOT(SessionConnected(QDBusObjectPath)));
20
 
+    connect(d->m_manager, SIGNAL(SessionClosed(QDBusObjectPath)), this, SLOT(SessionClosed(QDBusObjectPath)));
21
 
 
22
 
     d->m_status = Private::Online;
23
 
 }
24
 
@@ -135,6 +134,7 @@
25
 
         d->m_sessionMap.remove(i.key());
26
 
     }
27
 
 
28
 
+    delete d->m_manager;
29
 
     d->m_status = Private::Offline;
30
 
 }
31