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] Do not set body message if signature field is empty
[platform/upstream/glib.git]
/
gio
/
gdbusinterface.h
diff --git
a/gio/gdbusinterface.h
b/gio/gdbusinterface.h
index
a60e7cc
..
d6316b3
100644
(file)
--- a/
gio/gdbusinterface.h
+++ b/
gio/gdbusinterface.h
@@
-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>
*/
@@
-39,7
+37,6
@@
G_BEGIN_DECLS
*
* Since: 2.30
*/
*
* Since: 2.30
*/
-typedef struct _GDBusInterface GDBusInterface; /* Dummy typedef */
typedef struct _GDBusInterfaceIface GDBusInterfaceIface;
typedef struct _GDBusInterfaceIface GDBusInterfaceIface;
@@
-49,6
+46,7
@@
typedef struct _GDBusInterfaceIface GDBusInterfaceIface;
* @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_get_info().
* @get_object: Gets the enclosing #GDBusObject. See g_dbus_interface_get_object().
* @set_object: Sets the enclosing #GDBusObject. See g_dbus_interface_set_object().
* @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_get_info().
* @get_object: Gets the enclosing #GDBusObject. See g_dbus_interface_get_object().
* @set_object: Sets the enclosing #GDBusObject. See g_dbus_interface_set_object().
+ * @dup_object: Gets a reference to the enclosing #GDBusObject. See g_dbus_interface_dup_object(). Added in 2.32.
*
* Base type for D-Bus interfaces.
*
*
* Base type for D-Bus interfaces.
*
@@
-59,24
+57,24
@@
struct _GDBusInterfaceIface
GTypeInterface parent_iface;
/* Virtual Functions */
GTypeInterface parent_iface;
/* Virtual Functions */
- GDBusInterfaceInfo *(*get_info) (GDBusInterface *interface);
- GDBusObject *(*get_object) (GDBusInterface *interface);
- void (*set_object) (GDBusInterface *interface,
+ GDBusInterfaceInfo *(*get_info) (GDBusInterface *interface
_
);
+ GDBusObject *(*get_object) (GDBusInterface *interface
_
);
+ void (*set_object) (GDBusInterface *interface
_
,
GDBusObject *object);
GDBusObject *object);
+ GDBusObject *(*dup_object) (GDBusInterface *interface_);
};
};
+GLIB_AVAILABLE_IN_ALL
GType g_dbus_interface_get_type (void) G_GNUC_CONST;
GType g_dbus_interface_get_type (void) G_GNUC_CONST;
-GDBusInterfaceInfo *g_dbus_interface_get_info (GDBusInterface *interface);
-GDBusObject *g_dbus_interface_get_object (GDBusInterface *interface);
-void g_dbus_interface_set_object (GDBusInterface *interface,
+GLIB_AVAILABLE_IN_ALL
+GDBusInterfaceInfo *g_dbus_interface_get_info (GDBusInterface *interface_);
+GLIB_AVAILABLE_IN_ALL
+GDBusObject *g_dbus_interface_get_object (GDBusInterface *interface_);
+GLIB_AVAILABLE_IN_ALL
+void g_dbus_interface_set_object (GDBusInterface *interface_,
GDBusObject *object);
GDBusObject *object);
-
-/* Keep it here for now. TODO: move */
-
-gboolean g_dbus_gvariant_to_gvalue (GVariant *value,
- GValue *out_gvalue);
-GVariant *g_dbus_gvalue_to_gvariant (const GValue *gvalue,
- const GVariantType *expected_type);
+GLIB_AVAILABLE_IN_2_32
+GDBusObject *g_dbus_interface_dup_object (GDBusInterface *interface_);
G_END_DECLS
G_END_DECLS