projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Enable 'initial_read()' - is no longer needed
[platform/upstream/glib.git]
/
gio
/
gdbusobjectproxy.c
diff --git
a/gio/gdbusobjectproxy.c
b/gio/gdbusobjectproxy.c
index
2d18301
..
9788925
100644
(file)
--- a/
gio/gdbusobjectproxy.c
+++ b/
gio/gdbusobjectproxy.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
*
* Author: David Zeuthen <davidz@redhat.com>
*/
@@
-62,7
+60,8
@@
enum
static void dbus_object_interface_init (GDBusObjectIface *iface);
G_DEFINE_TYPE_WITH_CODE (GDBusObjectProxy, g_dbus_object_proxy, G_TYPE_OBJECT,
static void dbus_object_interface_init (GDBusObjectIface *iface);
G_DEFINE_TYPE_WITH_CODE (GDBusObjectProxy, g_dbus_object_proxy, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, dbus_object_interface_init));
+ G_ADD_PRIVATE (GDBusObjectProxy)
+ G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, dbus_object_interface_init))
static void
g_dbus_object_proxy_finalize (GObject *object)
static void
g_dbus_object_proxy_finalize (GObject *object)
@@
-71,6
+70,10
@@
g_dbus_object_proxy_finalize (GObject *object)
g_hash_table_unref (proxy->priv->map_name_to_iface);
g_hash_table_unref (proxy->priv->map_name_to_iface);
+ g_clear_object (&proxy->priv->connection);
+
+ g_free (proxy->priv->object_path);
+
g_mutex_clear (&proxy->priv->lock);
if (G_OBJECT_CLASS (g_dbus_object_proxy_parent_class)->finalize != NULL)
g_mutex_clear (&proxy->priv->lock);
if (G_OBJECT_CLASS (g_dbus_object_proxy_parent_class)->finalize != NULL)
@@
-98,7
+101,7
@@
g_dbus_object_proxy_get_property (GObject *object,
break;
default:
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (
_object
, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (
proxy
, prop_id, pspec);
break;
}
}
break;
}
}
@@
-126,7
+129,7
@@
g_dbus_object_proxy_set_property (GObject *object,
break;
default:
break;
default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (
_object
, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (
proxy
, prop_id, pspec);
break;
}
}
break;
}
}
@@
-173,16
+176,12
@@
g_dbus_object_proxy_class_init (GDBusObjectProxyClass *klass)
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
-
- g_type_class_add_private (klass, sizeof (GDBusObjectProxyPrivate));
}
static void
g_dbus_object_proxy_init (GDBusObjectProxy *proxy)
{
}
static void
g_dbus_object_proxy_init (GDBusObjectProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy,
- G_TYPE_DBUS_OBJECT_PROXY,
- GDBusObjectProxyPrivate);
+ proxy->priv = g_dbus_object_proxy_get_instance_private (proxy);
g_mutex_init (&proxy->priv->lock);
proxy->priv->map_name_to_iface = g_hash_table_new_full (g_str_hash,
g_str_equal,
g_mutex_init (&proxy->priv->lock);
proxy->priv->map_name_to_iface = g_hash_table_new_full (g_str_hash,
g_str_equal,