ekiga r6937 - in trunk: . lib/engine/components/avahi-publisher lib/engine/components/gmconf-personal-details src/endpoints
- From: jpuydt svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6937 - in trunk: . lib/engine/components/avahi-publisher lib/engine/components/gmconf-personal-details src/endpoints
- Date: Thu, 11 Sep 2008 19:39:58 +0000 (UTC)
Author: jpuydt
Date: Thu Sep 11 19:39:57 2008
New Revision: 6937
URL: http://svn.gnome.org/viewvc/ekiga?rev=6937&view=rev
Log:
Fixed #551196.
Modified:
trunk/ChangeLog
trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp
trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
trunk/src/endpoints/manager.cpp
Modified: trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp
==============================================================================
--- trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp (original)
+++ trunk/lib/engine/components/avahi-publisher/avahi-publisher.cpp Thu Sep 11 19:39:57 2008
@@ -124,7 +124,11 @@
(AvahiPublishFlags)0,
name, typ, NULL,
txt_record);
+
+ g_free (typ);
}
+
+ avahi_string_list_free (txt_record);
}
}
@@ -268,6 +272,8 @@
name, typ,
NULL, NULL,
iter->port, txt_record);
+
+ g_free (typ);
}
avahi_string_list_free (txt_record);
ret = avahi_entry_group_commit (group);
Modified: trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
==============================================================================
--- trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp (original)
+++ trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp Thu Sep 11 19:39:57 2008
@@ -96,21 +96,27 @@
long_status_changed_nt, this);
str = gm_conf_get_string ("/apps/ekiga/general/personal_data/full_name");
- if (str != NULL)
+ if (str != NULL) {
+
display_name = str;
- else
+ g_free (str);
+ } else
display_name = "";
str = gm_conf_get_string ("/apps/ekiga/general/personal_data/short_status");
- if (str != NULL)
+ if (str != NULL) {
+
short_status = str;
- else
+ g_free (str);
+ } else
short_status = "";
str = gm_conf_get_string ("/apps/ekiga/general/personal_data/long_status");
- if (str != NULL)
+ if (str != NULL) {
+
long_status = str;
- else
+ g_free (str);
+ } else
long_status = "";
}
Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp (original)
+++ trunk/src/endpoints/manager.cpp Thu Sep 11 19:39:57 2008
@@ -717,6 +717,9 @@
ready.emit ();
+ if (result != NULL)
+ g_free (result);
+
} else {
patience--;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]