[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / gio / gnetworkservice.c

diff --git a/gio/gnetworkservice.c b/gio/gnetworkservice.c
index 9ec0099..497d6fd 100644 (file)
--- a/gio/gnetworkservice.c
+++ b/gio/gnetworkservice.c
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -93,6 +91,7 @@ static GSocketAddressEnumerator *g_network_service_connectable_enumerate
 static GSocketAddressEnumerator *g_network_service_connectable_proxy_enumerate  (GSocketConnectable      *connectable);
 
 G_DEFINE_TYPE_WITH_CODE (GNetworkService, g_network_service, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GNetworkService)
                          G_IMPLEMENT_INTERFACE (G_TYPE_SOCKET_CONNECTABLE,
                                                 g_network_service_connectable_iface_init))
 
@@ -117,8 +116,6 @@ g_network_service_class_init (GNetworkServiceClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GNetworkServicePrivate));
-
   gobject_class->set_property = g_network_service_set_property;
   gobject_class->get_property = g_network_service_get_property;
   gobject_class->finalize = g_network_service_finalize;
@@ -167,8 +164,7 @@ g_network_service_connectable_iface_init (GSocketConnectableIface *connectable_i
 static void
 g_network_service_init (GNetworkService *srv)
 {
-  srv->priv = G_TYPE_INSTANCE_GET_PRIVATE (srv, G_TYPE_NETWORK_SERVICE,
-                                           GNetworkServicePrivate);
+  srv->priv = g_network_service_get_instance_private (srv);
 }
 
 static void
@@ -245,7 +241,7 @@ g_network_service_get_property (GObject    *object,
  * @protocol, and @domain. This will initially be unresolved; use the
  * #GSocketConnectable interface to resolve it.
  *
- * Return value: (transfer full) (type GNetworkService): a new #GNetworkService
+ * Returns: (transfer full) (type GNetworkService): a new #GNetworkService
  *
  * Since: 2.22
  */
@@ -267,7 +263,7 @@ g_network_service_new (const gchar *service,
  *
  * Gets @srv's service name (eg, "ldap").
  *
- * Return value: @srv's service name
+ * Returns: @srv's service name
  *
  * Since: 2.22
  */
@@ -285,7 +281,7 @@ g_network_service_get_service (GNetworkService *srv)
  *
  * Gets @srv's protocol name (eg, "tcp").
  *
- * Return value: @srv's protocol name
+ * Returns: @srv's protocol name
  *
  * Since: 2.22
  */
@@ -304,7 +300,7 @@ g_network_service_get_protocol (GNetworkService *srv)
  * Gets the domain that @srv serves. This might be either UTF-8 or
  * ASCII-encoded, depending on what @srv was created with.
  *
- * Return value: @srv's domain name
+ * Returns: @srv's domain name
  *
  * Since: 2.22
  */
@@ -323,7 +319,7 @@ g_network_service_get_domain (GNetworkService *srv)
  * Get's the URI scheme used to resolve proxies. By default, the service name
  * is used as scheme.
  *
- * Return value: @srv's scheme name
+ * Returns: @srv's scheme name
  *
  * Since: 2.26
  */
@@ -354,8 +350,7 @@ g_network_service_set_scheme (GNetworkService *srv,
 {
   g_return_if_fail (G_IS_NETWORK_SERVICE (srv));
 
-  if (srv->priv->scheme)
-    g_free (srv->priv->scheme);
+  g_free (srv->priv->scheme);
   srv->priv->scheme = g_strdup (scheme);
 
   g_object_notify (G_OBJECT (srv), "scheme");