← Back to branch summary

~ubuntu-branches/ubuntu/natty/vino/natty

« back to all changes in this revision

Viewing changes to debian/patches/90_git_change_fix_no_mdns_crasher.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-03-30 19:45:22 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20100330194522-bp71pt39udos0umi
Tags: 2.28.2-0ubuntu1
* New upstream version
* debian/patches/90_git_change_fix_no_mdns_crasher.patch:
  - the change is in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/90_git_change_fix_no_mdns_crasher.patch
1
 
Subject: Check if mDNS is active before asking for a local hostname.
2
 
 
3
 
Closes Ubuntu #440712.
4
 
---
5
 
diff --git a/server/vino-mdns.c b/server/vino-mdns.c
6
 
index 0a742f4..4f7e693 100644
7
 
--- a/server/vino-mdns.c
8
 
+++ b/server/vino-mdns.c
9
 
@@ -356,7 +356,7 @@ vino_mdns_shutdown (void)
10
 
 const char *
11
 
 vino_mdns_get_hostname (void)
12
 
 {
13
 
-  return avahi_client_get_host_name_fqdn (mdns_client);
14
 
+  return mdns_client ? avahi_client_get_host_name_fqdn (mdns_client) : "";
15
 
 }
16
 
 
17
 
 #else /* !defined (VINO_HAVE_AVAHI) */
18