summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--extensions/.gitignore2
-rw-r--r--extensions/Makefile.am126
-rw-r--r--extensions/all.xml22
-rw-r--r--extensions/extensions-cli.c32
-rw-r--r--extensions/extensions.c7
-rw-r--r--extensions/extensions.h19
-rw-r--r--extensions/generic-types.xml108
-rw-r--r--extensions/misc.xml7
-rw-r--r--libempathy-gtk/Makefile.am1
-rw-r--r--libempathy-gtk/empathy-log-window.c1
-rw-r--r--libempathy/Makefile.am2
-rw-r--r--libempathy/empathy-server-sasl-handler.c1
-rw-r--r--libempathy/empathy-utils.c3
-rw-r--r--src/Makefile.am3
16 files changed, 1 insertions, 336 deletions
diff --git a/Makefile.am b/Makefile.am
index ae9e4dc5..f09d1379 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-MY_SUBDIRS = tools extensions po data telepathy-account-widgets libempathy libempathy-gtk src help tests
+MY_SUBDIRS = tools po data telepathy-account-widgets libempathy libempathy-gtk src help tests
GOA_SUBDIRS = goa-mc-plugin
UOA_SUBDIRS = ubuntu-online-accounts
diff --git a/configure.ac b/configure.ac
index 914d292b..2cb164f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -595,7 +595,6 @@ AC_CONFIG_FILES([
data/empathy.desktop.in
data/icons/Makefile
data/themes/Makefile
- extensions/Makefile
po/Makefile.in
libempathy/Makefile
libempathy-gtk/Makefile
diff --git a/extensions/.gitignore b/extensions/.gitignore
deleted file mode 100644
index 09d7dbf5..00000000
--- a/extensions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-_gen
-extensions.html
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
deleted file mode 100644
index daeeee70..00000000
--- a/extensions/Makefile.am
+++ /dev/null
@@ -1,126 +0,0 @@
-tools_dir = $(top_srcdir)/tools
-
-AM_CPPFLAGS = $(DISABLE_DEPRECATED)
-
-AM_CFLAGS = \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(WARN_CFLAGS) \
- $(EMPATHY_CFLAGS)
-
-EXTRA_DIST = \
- all.xml \
- generic-types.xml \
- misc.xml \
- $(NULL)
-
-noinst_LTLIBRARIES = libemp-extensions.la
-
-libemp_extensions_la_LIBADD = \
- $(TP_GLIB_LIBS)
-
-# The client-specific parts are built into a separate .o file, so the linker
-# can discard them when linking services. The service-specific parts are
-# in svc-*.c, so we don't need an extensions-svc.c.
-libemp_extensions_la_SOURCES = \
- extensions.c \
- extensions-cli.c \
- extensions.h
-
-nodist_libemp_extensions_la_SOURCES = \
- _gen/register-dbus-glib-marshallers-body.h \
- _gen/enums.h \
- _gen/gtypes.h \
- _gen/gtypes-body.h \
- _gen/interfaces.h \
- _gen/interfaces-body.h \
- _gen/cli-misc.h \
- _gen/cli-misc-body.h \
- _gen/svc-misc.h \
- _gen/svc-misc.c
-
-BUILT_SOURCES = \
- _gen/all.xml \
- _gen/misc.xml \
- $(nodist_libemp_extensions_la_SOURCES) \
- extensions.html
-
-CLEANFILES = $(BUILT_SOURCES)
-
-clean-local:
- rm -rf _gen
-
-XSLTPROCFLAGS = --nonet --novalid
-
-# Generated files which can be generated for all categories simultaneously
-
-_gen/all.xml: all.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
- @$(MKDIR_P) _gen
- $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
-
-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
- $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
- --param "allow-undefined-interfaces" "true()" \
- $(tools_dir)/doc-generator.xsl \
- $< > $@
-
-_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
- $(top_srcdir)/tools/glib-gtypes-generator.py
- $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
- $< _gen/gtypes Emp
-
-_gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
- $(tools_dir)/glib-client-marshaller-gen.py
- $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
- _emp_ext > $@
-
-_gen/enums.h: _gen/all.xml \
- $(tools_dir)/c-constants-gen.py
- $(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \
- Emp \
- $< _gen/enums
-
-_gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
- $(tools_dir)/glib-interfaces-gen.py
- $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
- Emp _gen/interfaces-body.h _gen/interfaces.h $<
-
-# Generated files which must be generated per "category". Each TpProxy
-# subclass you want to use with --subclass will need to have its own category,
-# although you can subdivide further if you want.
-
-_gen/misc.xml: misc.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
- @$(MKDIR_P) _gen
- $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
-
-_gen/cli-misc-body.h: _gen/cli-misc.h
-
-_gen/cli-misc.h: _gen/misc.xml \
- $(tools_dir)/glib-client-gen.py
- $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
- --group=misc \
- --subclass=TpProxy \
- --subclass-assert=TP_IS_PROXY \
- --iface-quark-prefix=EMP_IFACE_QUARK \
- --tp-proxy-api=0.10.0 \
- $< Emp_Cli _gen/cli-misc
-
-# There is no need to execute glib-ginterface-gen.py twice because it
-# generates both the .c and .h files in one shot. Therefore, merely
-# having one of them (say the .c) depend on the other (say the .h) is
-# enough.
-#
-# Moreover, running it twice breaks parallel builds because one
-# glib-ginterface-gen.py process steps on the other.
-
-_gen/svc-misc.c: _gen/svc-misc.h
-
-_gen/svc-misc.h: _gen/misc.xml \
- $(tools_dir)/glib-ginterface-gen.py
- $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
- --filename=_gen/svc-misc \
- --signal-marshal-prefix=_emp_ext \
- --include='<telepathy-glib/telepathy-glib.h>' \
- --not-implemented-func='tp_dbus_g_method_return_not_implemented' \
- --allow-unstable \
- $< Emp_Svc_
diff --git a/extensions/all.xml b/extensions/all.xml
deleted file mode 100644
index d0b9173c..00000000
--- a/extensions/all.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<tp:spec
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<tp:title>Extensions for empathy</tp:title>
-
-<xi:include href="misc.xml"/>
-<xi:include href="generic-types.xml"/>
-
-<tp:generic-types>
- <tp:external-type name="Contact_Handle" type="u"
- from="Telepathy specification"/>
- <tp:external-type name="Handle_Type" type="u"
- from="Telepathy specification"/>
- <tp:external-type name="Handle" type="u"
- from="Telepathy specification"/>
- <tp:external-type name="Account" type="o"
- from="Telepathy specification"/>
-</tp:generic-types>
-
-
-</tp:spec>
diff --git a/extensions/extensions-cli.c b/extensions/extensions-cli.c
deleted file mode 100644
index 982edf3d..00000000
--- a/extensions/extensions-cli.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "config.h"
-
-#include "extensions.h"
-
-#include <telepathy-glib/proxy-subclass.h>
-
-static void _emp_ext_register_dbus_glib_marshallers (void);
-
-/* include auto-generated stubs for client-specific code */
-#include "_gen/cli-misc-body.h"
-#include "_gen/register-dbus-glib-marshallers-body.h"
-
-static gpointer
-emp_cli_once (gpointer data)
-{
- _emp_ext_register_dbus_glib_marshallers ();
-
- tp_proxy_init_known_interfaces ();
-
- tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_PROXY,
- emp_cli_misc_add_signals);
-
- return NULL;
-}
-
-void
-emp_cli_init (void)
-{
- static GOnce once = G_ONCE_INIT;
-
- g_once (&once, emp_cli_once, NULL);
-}
diff --git a/extensions/extensions.c b/extensions/extensions.c
deleted file mode 100644
index 74fd679f..00000000
--- a/extensions/extensions.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "config.h"
-
-#include "extensions.h"
-
-/* include auto-generated stubs for things common to service and client */
-#include "_gen/gtypes-body.h"
-#include "_gen/interfaces-body.h"
diff --git a/extensions/extensions.h b/extensions/extensions.h
deleted file mode 100644
index c1c42164..00000000
--- a/extensions/extensions.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __EMP_EXTENSIONS_H__
-#define __EMP_EXTENSIONS_H__
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include "extensions/_gen/enums.h"
-#include "extensions/_gen/cli-misc.h"
-#include "extensions/_gen/svc-misc.h"
-
-G_BEGIN_DECLS
-
-#include "extensions/_gen/gtypes.h"
-#include "extensions/_gen/interfaces.h"
-
-void emp_cli_init (void);
-
-G_END_DECLS
-
-#endif
diff --git a/extensions/generic-types.xml b/extensions/generic-types.xml
deleted file mode 100644
index 8949210c..00000000
--- a/extensions/generic-types.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<tp:generic-types
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-
- <tp:simple-type name="Unix_Timestamp" type="u">
- <tp:docstring>An unsigned 32-bit integer representing time as the number
- of seconds elapsed since the Unix epoch
- (1970-01-01T00:00:00Z)</tp:docstring>
- </tp:simple-type>
-
- <tp:simple-type name="Unix_Timestamp64" type="x">
- <tp:docstring>An signed 64-bit integer representing time as the number
- of seconds elapsed since the Unix epoch
- (1970-01-01T00:00:00Z); negative for times before the epoch</tp:docstring>
-
- <tp:rationale>The Text interface is the only user of Unix_Timestamp so
- far, and we'd like to be Y2038 compatible in future
- interfaces.</tp:rationale>
- </tp:simple-type>
-
- <tp:simple-type name="DBus_Bus_Name" type="s">
- <tp:docstring>A string representing a D-Bus bus name - either a well-known
- name like "im.telepathy.v1.MissionControl" or a unique name
- like ":1.123"</tp:docstring>
- </tp:simple-type>
-
- <tp:simple-type name="DBus_Well_Known_Name" type="s">
- <tp:docstring>A string representing a D-Bus well-known
- name like "im.telepathy.v1.MissionControl".</tp:docstring>
- </tp:simple-type>
-
- <tp:simple-type name="DBus_Unique_Name" type="s">
- <tp:docstring>A string representing a D-Bus unique name, such as
- ":1.123"</tp:docstring>
- </tp:simple-type>
-
- <tp:simple-type name="DBus_Interface" type="s">
- <tp:docstring>An ASCII string representing a D-Bus interface - two or more
- elements separated by dots, where each element is a non-empty
- string of ASCII letters, digits and underscores, not starting with
- a digit. The maximum total length is 255 characters. For example,
- "org.freedesktop.DBus.Peer".</tp:docstring>
- </tp:simple-type>
-
- <tp:simple-type name="DBus_Error_Name" type="s">
- <tp:docstring>An ASCII string representing a D-Bus error. This is
- syntactically the same as a <tp:type>DBus_Interface</tp:type>, but the
- meaning is different.</tp:docstring>
- </tp:simple-type>
-
- <tp:simple-type name="DBus_Signature" type="s">
- <tp:docstring>A string representing a D-Bus signature
- (the 'g' type isn't used because of poor interoperability, particularly
- with dbus-glib)</tp:docstring>
- </tp:simple-type>
-
- <tp:struct name="DBus_Tube_Member" array-name="DBus_Tube_Member_List">
- <tp:docstring>A struct (handle, unique name) representing a participant
- in a D-Bus tube, as returned by GetDBusNames on the Tubes channel
- type, and as seen in the DBusNamesChanged signal.</tp:docstring>
- <tp:member type="u" tp:type="Contact_Handle" name="Handle"/>
- <tp:member type="s" tp:type="DBus_Unique_Name" name="Unique_Name"/>
- </tp:struct>
-
- <tp:simple-type name="DBus_Member" type="s">
- <tp:docstring>An ASCII string representing a D-Bus method, signal
- or property name - a non-empty string of ASCII letters, digits and
- underscores, not starting with a digit, with a maximum length of 255
- characters. For example, "Ping".</tp:docstring>
- </tp:simple-type>
-
- <tp:simple-type name="DBus_Qualified_Member" type="s">
- <tp:docstring>A string representing the full name of a D-Bus method,
- signal or property, consisting of a DBus_Interface, followed by
- a dot, followed by a DBus_Member. For example,
- "org.freedesktop.DBus.Peer.Ping".</tp:docstring>
- </tp:simple-type>
-
- <tp:mapping name="Qualified_Property_Value_Map"
- array-name="Qualified_Property_Value_Map_List">
- <tp:docstring>A mapping from strings representing D-Bus
- properties (by their namespaced names) to their values.</tp:docstring>
- <tp:member type="s" name="Key" tp:type="DBus_Qualified_Member">
- <tp:docstring>
- A D-Bus interface name, followed by a dot and a D-Bus property name.
- </tp:docstring>
- </tp:member>
- <tp:member type="v" name="Value">
- <tp:docstring>
- The value of the property.
- </tp:docstring>
- </tp:member>
- </tp:mapping>
-
- <tp:mapping name="String_Variant_Map" array-name="String_Variant_Map_List">
- <tp:docstring>A mapping from strings to variants representing extra
- key-value pairs.</tp:docstring>
- <tp:member type="s" name="Key"/>
- <tp:member type="v" name="Value"/>
- </tp:mapping>
-
- <tp:mapping name="String_String_Map">
- <tp:docstring>A mapping from strings to strings representing extra
- key-value pairs.</tp:docstring>
- <tp:member type="s" name="Key"/>
- <tp:member type="s" name="Value"/>
- </tp:mapping>
-
-</tp:generic-types>
diff --git a/extensions/misc.xml b/extensions/misc.xml
deleted file mode 100644
index 7c1e1ead..00000000
--- a/extensions/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<tp:spec
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<tp:title>Misc extensions for Empathy</tp:title>
-
-</tp:spec>
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 8ea81d49..b425b33b 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/tools/flymake.mk
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
-I$(top_srcdir)/libempathy \
- -I$(top_srcdir)/extensions \
-DDATADIR=\""$(datadir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DGCR_API_SUBJECT_TO_CHANGE \
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 272bc0a4..c1fecf9d 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -45,7 +45,6 @@
#include "empathy-ui-utils.h"
#include "empathy-utils.h"
#include "empathy-webkit-utils.h"
-#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index b87b35b9..15dc4d75 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/tools/flymake.mk
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I$(top_srcdir)/extensions \
-I$(top_builddir) \
-DDATADIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
@@ -106,7 +105,6 @@ libempathy_la_SOURCES = \
$(NULL)
libempathy_la_LIBADD = \
- $(top_builddir)/extensions/libemp-extensions.la \
$(GCR_LIBS) \
$(EMPATHY_LIBS) \
$(TPAW_LIBS) \
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 40be7305..c7ae0e97 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -24,7 +24,6 @@
#include <telepathy-glib/telepathy-glib-dbus.h>
#include "empathy-sasl-mechanisms.h"
-#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 230fe556..e8140de3 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -35,7 +35,6 @@
#include <telepathy-glib/telepathy-glib-dbus.h>
#include "empathy-client-factory.h"
-#include "extensions.h"
#include <math.h>
@@ -96,8 +95,6 @@ empathy_init (void)
empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG"));
tp_debug_divert_messages (g_getenv ("EMPATHY_LOGFILE"));
- emp_cli_init ();
-
initialized = TRUE;
factory = empathy_client_factory_dup ();
diff --git a/src/Makefile.am b/src/Makefile.am
index 8806ae45..5f268515 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,6 @@ CPPFLAGS_COMMON = \
$(ERROR_CFLAGS) \
-I$(top_srcdir)/libempathy-gtk \
-I$(top_srcdir)/libempathy \
- -I$(top_srcdir)/extensions \
-I$(top_builddir)/libempathy-gtk \
-I$(top_builddir)/libempathy \
-DG_LOG_DOMAIN=\"empathy\" \
@@ -25,7 +24,6 @@ AM_CPPFLAGS = \
LDADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/extensions/libemp-extensions.la \
$(GCR_LIBS) \
$(EMPATHY_LIBS) \
$(TPAW_LIBS) \
@@ -162,7 +160,6 @@ empathy_LDADD = \
libempathy-accounts-common.la \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/extensions/libemp-extensions.la \
$(EMPATHY_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(NULL)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 10:28:10 +0000