AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I. \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/extensions \
-DDATADIR=\""$(datadir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DGCR_API_SUBJECT_TO_CHANGE \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __LIBEMPATHY_GTK_ENUM_TYPES_H__ */\n" \
- --fprod '#include "libempathy-gtk/@filename@"\n' \
+ --fprod '#include "@filename@"\n' \
--eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(libempathy_gtk_headers) ) > xgen-gth \
#include "empathy-account-chooser.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/**
* SECTION:empathy-account-chooser
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
typedef struct {
EmpathyAccountWidget *self;
#define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-account-widget.h"
-#include "libempathy-gtk/empathy-irc-network-chooser.h"
+#include "empathy-account-widget.h"
+#include "empathy-irc-network-chooser.h"
G_BEGIN_DECLS
#ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
#define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
-#include "libempathy-gtk/empathy-account-widget.h"
+#include "empathy-account-widget.h"
#include <glib.h>
#include <gtk/gtk.h>
#define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-account-widget.h"
+#include "empathy-account-widget.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include <dbus/dbus-protocol.h>
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX)
#include <gtk/gtk.h>
-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
#include "empathy-avatar-chooser.h"
#include "empathy-images.h"
#endif /* HAVE_CHEESE */
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/**
* SECTION:empathy-avatar-chooser
#include <glib/gi18n-lib.h>
#include <gdk/gdkx.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-avatar-image.h"
#include "empathy-ui-utils.h"
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog,
EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-base-password-dialog.h"
+#include "empathy-base-password-dialog.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
GTK_TYPE_MESSAGE_DIALOG)
#include "empathy-calendar-button.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX)
#include "empathy-call-utils.h"
-#include "libempathy/empathy-request-util.h"
+#include "empathy-request-util.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
static const gchar *
get_error_display_message (GError *error)
#include "config.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-cell-renderer-activatable.h"
* Authors: Kristian Rietveld <kris@imendio.com>
*/
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-cell-renderer-expander.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)
#include "config.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-cell-renderer-text.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-keyring.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-gsettings.h"
+#include "empathy-keyring.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-client-factory.h"
#include "empathy-chat.h"
#include "empathy-spell.h"
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
#include "empathy-string-parser.h"
-#include "extensions/extensions.h"
+#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
#define COMPOSING_STOP_TIMEOUT 5
#include <gtk/gtk.h>
-#include "libempathy/empathy-contact.h"
-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-contact.h"
+#include "empathy-tp-chat.h"
-#include "libempathy-gtk/empathy-theme-adium.h"
+#include "empathy-theme-adium.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-account-chooser.h"
#include "empathy-ui-utils.h"
#include "empathy-contact-blocking-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define GET_PRIVATE(o) (EMPATHY_CONTACT_BLOCKING_DIALOG (o)->priv)
#define DECLARE_CALLBACK(func) \
#include "empathy-contact-chooser.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-utils.h"
+#include "empathy-client-factory.h"
#include "empathy-individual-store-manager.h"
#include "empathy-individual-view.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-utils.h"
+#include "empathy-client-factory.h"
#include "empathy-account-chooser.h"
#include "empathy-cell-renderer-text.h"
#include "empathy-images.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-contact-search-dialog.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-utils.h"
+#include "empathy-client-factory.h"
#include "empathy-contact-widget.h"
#include "empathy-avatar-image.h"
#include "empathy-string-parser.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/**
* SECTION:empathy-contact-widget
#include <gtk/gtk.h>
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
#include "empathy-account-chooser.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-request-util.h"
+#include "empathy-time.h"
+#include "empathy-request-util.h"
#include "empathy-contactinfo-utils.h"
#include "empathy-string-parser.h"
#include <sys/stat.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-geometry.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define GEOMETRY_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR)
#define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-connection-aggregator.h"
+#include "empathy-utils.h"
+#include "empathy-connection-aggregator.h"
#include "empathy-groups-widget.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-individual-manager.h"
+#include "empathy-utils.h"
#include "empathy-individual-dialogs.h"
#include "empathy-contact-widget.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-individual-edit-dialog.h"
#include "empathy-individual-widget.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-pkg-kit.h"
+#include "empathy-individual-manager.h"
+#include "empathy-utils.h"
+#include "empathy-pkg-kit.h"
#include "empathy-individual-information-dialog.h"
#include "empathy-individual-widget.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
typedef struct {
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-request-util.h"
+#include "empathy-individual-manager.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-utils.h"
#include "empathy-account-selector-dialog.h"
#include "empathy-images.h"
#include "empathy-individual-information-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu)
#include "config.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-individual-store-channel.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
struct _EmpathyIndividualStoreChannelPriv
{
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-individual-store.h"
+#include "empathy-individual-store.h"
G_BEGIN_DECLS
#define EMPATHY_TYPE_INDIVIDUAL_STORE_CHANNEL (empathy_individual_store_channel_get_type ())
#include "empathy-individual-store-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
struct _EmpathyIndividualStoreManagerPriv
{
#include <gtk/gtk.h>
-#include "libempathy/empathy-individual-manager.h"
+#include "empathy-individual-manager.h"
-#include "libempathy-gtk/empathy-individual-store.h"
+#include "empathy-individual-store.h"
G_BEGIN_DECLS
#define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER (empathy_individual_store_manager_get_type ())
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-ui-utils.h"
#include "empathy-gtk-enum-types.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Active users are those which have recently changed state
* (e.g. online, offline or from normal to a busy state).
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-connection-aggregator.h"
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-contact-groups.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-individual-manager.h"
+#include "empathy-contact-groups.h"
+#include "empathy-request-util.h"
+#include "empathy-utils.h"
#include "empathy-individual-edit-dialog.h"
#include "empathy-images.h"
#include "empathy-gtk-enum-types.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Active users are those which have recently changed state
* (e.g. online, offline or from normal to a busy state).
#include <champlain-gtk/champlain-gtk.h>
#endif
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-location.h"
-#include "libempathy/empathy-time.h"
+#include "empathy-utils.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
#include "empathy-avatar-image.h"
#include "empathy-contactinfo-utils.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/**
* SECTION:empathy-individual-widget
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-utils.h"
+#include "empathy-irc-network-manager.h"
#include "empathy-irc-network-dialog.h"
#include "empathy-live-search.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-irc-network-chooser-dialog.h"
#include <gtk/gtk.h>
-#include "libempathy/empathy-account-settings.h"
-#include "libempathy/empathy-irc-network.h"
+#include "empathy-account-settings.h"
+#include "empathy-irc-network.h"
G_BEGIN_DECLS
#include "config.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-utils.h"
+#include "empathy-irc-network-manager.h"
#include "empathy-ui-utils.h"
#include "empathy-irc-network-chooser-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-irc-network-chooser.h"
#include <gtk/gtk.h>
-#include "libempathy/empathy-account-settings.h"
-#include "libempathy/empathy-irc-network.h"
+#include "empathy-account-settings.h"
+#include "empathy-irc-network.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-ui-utils.h"
#include "totem-subtitle-encoding.h"
#include <gtk/gtk.h>
-#include "libempathy/empathy-irc-network.h"
+#include "empathy-irc-network.h"
G_BEGIN_DECLS
#include "config.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-live-search.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-account-widget.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget,
empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID)
#include "empathy-location-manager.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-location.h"
-#include "libempathy/empathy-time.h"
+#include "empathy-gsettings.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Seconds before updating the location */
#define TIMEOUT 10
#include <telepathy-glib/proxy-subclass.h>
-#include "extensions/extensions.h"
+#include "extensions.h"
-#include "libempathy/action-chain-internal.h"
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.h"
+#include "action-chain-internal.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
+#include "empathy-utils.h"
#include "empathy-log-window.h"
#include "empathy-account-chooser.h"
#include "empathy-geometry.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define EMPATHY_NS "http://live.gnome.org/Empathy"
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-account-widget.h"
#include "empathy-protocol-chooser.h"
#include <gtk/gtk.h>
-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-contact-chooser.h"
#include "empathy-ui-utils.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-request-util.h"
+#include "empathy-request-util.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-contact-chooser.h"
#include "empathy-ui-utils.h"
#include <libnotify/notify.h>
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-notify-manager.h"
#include <glib-object.h>
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
#include <libnotify/notification.h>
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "libempathy/empathy-server-sasl-handler.h"
+#include "empathy-server-sasl-handler.h"
-#include "libempathy-gtk/empathy-base-password-dialog.h"
+#include "empathy-base-password-dialog.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-presence-manager.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
+#include "empathy-status-presets.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-ui-utils.h"
#include "empathy-presence-chooser.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-connection-managers.h"
+#include "empathy-utils.h"
+#include "empathy-connection-managers.h"
#include "empathy-protocol-chooser.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/**
* SECTION:empathy-protocol-chooser
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"
G_BEGIN_DECLS
#include "empathy-roster-contact.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-images.h"
#include "empathy-ui-utils.h"
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
#include <glib-object.h>
-#include "libempathy/empathy-individual-manager.h"
+#include "empathy-individual-manager.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-contact-groups.h"
+#include "empathy-contact-groups.h"
#include "empathy-roster-contact.h"
#include "empathy-roster-group.h"
#ifndef __EMPATHY_ROSTER_VIEW_H__
#define __EMPATHY_ROSTER_VIEW_H__
-#include "libempathy-gtk/egg-list-box/egg-list-box.h"
-#include "libempathy-gtk/empathy-live-search.h"
+#include "egg-list-box/egg-list-box.h"
+#include "empathy-live-search.h"
-#include "libempathy-gtk/empathy-roster-model.h"
+#include "empathy-roster-model.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-search-bar.h"
#include "empathy-ui-utils.h"
#include "config.h"
#define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-share-my-desktop.h"
#ifndef __EMPATHY_SHARE_MY_DESKTOP_H__
#define __EMPATHY_SHARE_MY_DESKTOP_H__
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
void empathy_share_my_desktop_share_with_contact (EmpathyContact *contact);
#include "config.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
typedef struct {
EmpathySound sound_id;
#include "empathy-spell.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-debug.h"
+#include "empathy-gsettings.h"
#ifdef HAVE_ENCHANT
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-utils.h"
+#include "empathy-status-presets.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-ui-utils.h"
#include "empathy-status-preset-dialog.h"
#include "empathy-subscription-dialog.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-individual-widget.h"
#include <glib/gi18n-lib.h>
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
#include "empathy-theme-adium.h"
#include "empathy-smiley-manager.h"
#include "empathy-webkit-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define BORING_DPI_DEFAULT 96
#include <webkit/webkitwebview.h>
-#include "libempathy/empathy-message.h"
+#include "empathy-message.h"
G_BEGIN_DECLS
#include <gtk/gtk.h>
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-gsettings.h"
#include "empathy-theme-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
struct _EmpathyThemeManagerPriv
{
#include <gcr/gcr.h>
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog,
GTK_TYPE_MESSAGE_DIALOG)
#include "empathy-live-search.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-ft-factory.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
+#include "empathy-ft-factory.h"
void
empathy_gtk_init (void)
#include <folks/folks.h>
-#include "libempathy/empathy-contact.h"
-#include "libempathy/empathy-ft-handler.h"
+#include "empathy-contact.h"
+#include "empathy-ft-handler.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
#include "empathy-avatar-chooser.h"
#include "empathy-calendar-button.h"
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I. \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/extensions \
-I$(top_builddir) \
-DDATADIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __LIBEMPATHY_ENUM_TYPES_H__ */\n" \
- --fprod '#include "libempathy/@filename@"\n' \
+ --fprod '#include "@filename@"\n' \
--eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(libempathy_headers) ) > xgen-gth \
#include "empathy-uoa-auth-handler.h"
#endif /* HAVE_UOA */
-#include "extensions/extensions.h"
+#include "extensions.h"
G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-tp-chat.h"
G_BEGIN_DECLS
#include "empathy-server-sasl-handler.h"
-#include "extensions/extensions.h"
+#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
#include "empathy-debug.h"
#include "empathy-utils.h"
-#include "extensions/extensions.h"
+#include "extensions.h"
static void async_initable_iface_init (GAsyncInitableIface *iface);
#include "empathy-utils.h"
#include "empathy-presence-manager.h"
-#include "extensions/extensions.h"
+#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
INCLUDES = \
-I$(top_builddir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/libempathy-gtk \
-DLOCALEDIR=\""$(datadir)/locale"\" \
$(NST_CFLAGS) \
$(WARN_CFLAGS) \
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy/empathy-contact.h"
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-ft-factory.h"
-#include "libempathy/empathy-ft-handler.h"
-
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-contact-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-roster-contact.h"
+#include "empathy-contact.h"
+#include "empathy-debug.h"
+#include "empathy-ft-factory.h"
+#include "empathy-ft-handler.h"
+
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-roster-contact.h"
#include "nautilus-sendto-plugin.h"
CPPFLAGS_COMMON = \
$(EMPATHY_CFLAGS) \
$(ERROR_CFLAGS) \
- -I$(top_srcdir) \
+ -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\" \
-DBIN_DIR=\"$(bindir)\" \
$(DISABLE_DEPRECATED) \
#include "config.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
gboolean
empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
#include <glib/gi18n-lib.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-pkg-kit.h"
+#include "empathy-utils.h"
+#include "empathy-pkg-kit.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-account-widget-sip.h"
-#include "libempathy-gtk/empathy-user-info.h"
-#include "libempathy-gtk/empathy-local-xmpp-assistant-widget.h"
-#include "libempathy-gtk/empathy-new-account-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-account-widget-sip.h"
+#include "empathy-user-info.h"
+#include "empathy-local-xmpp-assistant-widget.h"
+#include "empathy-new-account-dialog.h"
#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
#include "empathy-import-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Flashing delay for icons (milliseconds). */
#define FLASH_TIMEOUT 500
#include <cheese-gtk.h>
#endif
-#include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "empathy-ui-utils.h"
#include "empathy-accounts-common.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
#include "empathy-audio-sink.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN)
#include <gst/interfaces/streamvolume.h>
#endif
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#include "empathy-audio-utils.h"
#include "empathy-audio-src.h"
#include "empathy-mic-monitor.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN)
#include "empathy-audio-utils.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-gsettings.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
void
empathy_audio_set_stream_properties (GstElement *element,
#include <glib/gi18n.h>
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-auth-factory.h"
-#include "libempathy/empathy-server-tls-handler.h"
-#include "libempathy/empathy-tls-verifier.h"
-
-#include "libempathy-gtk/empathy-bad-password-dialog.h"
-#include "libempathy-gtk/empathy-password-dialog.h"
-#include "libempathy-gtk/empathy-tls-dialog.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-debug.h"
+#include "empathy-auth-factory.h"
+#include "empathy-server-tls-handler.h"
+#include "empathy-tls-verifier.h"
+
+#include "empathy-bad-password-dialog.h"
+#include "empathy-password-dialog.h"
+#include "empathy-tls-dialog.h"
+#include "empathy-ui-utils.h"
#include "empathy-sanity-cleaning.h"
#include "config.h"
-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-request-util.h"
+#include "empathy-client-factory.h"
+#include "empathy-request-util.h"
#include "empathy-call-factory.h"
#include "empathy-call-handler.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
#include <telepathy-farstream/telepathy-farstream.h>
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-call-utils.h"
+#include "empathy-call-utils.h"
#include "empathy-call-handler.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT)
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-notify-manager.h"
+#include "empathy-images.h"
+#include "empathy-notify-manager.h"
#include "empathy-call-observer.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
struct _EmpathyCallObserverPriv {
EmpathyNotifyManager *notify_mgr;
#include "empathy-call-window-fullscreen.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "empathy-ui-utils.h"
/* The number of seconds for which the "leave fullscreen" popup should
be shown */
#include <farstream/fs-element-added-notifier.h>
#include <farstream/fs-utils.h>
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.h"
-
-#include "libempathy-gtk/empathy-dialpad-widget.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-sound-manager.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-call-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
+#include "empathy-utils.h"
+
+#include "empathy-dialpad-widget.h"
+#include "empathy-ui-utils.h"
+#include "empathy-sound-manager.h"
+#include "empathy-geometry.h"
+#include "empathy-images.h"
+#include "empathy-call-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-call-window-fullscreen.h"
#include "empathy-about-dialog.h"
#include <X11/Xlib.h>
#endif
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
#include "empathy-call-window.h"
#include "empathy-call-factory.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Exit after $TIMEOUT seconds if not displaying any call window */
#define TIMEOUT 60
#include "config.h"
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
#include "empathy-camera-menu.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
struct _EmpathyCameraMenuPrivate
{
#include <telepathy-glib/proxy-subclass.h>
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-individual-manager.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-individual-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
#include "empathy-chat-window.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-chat-manager.h"
-#include "extensions/extensions.h"
+#include "extensions.h"
enum {
CLOSED_CHATS_CHANGED,
#include <glib-object.h>
-#include "libempathy-gtk/empathy-chat.h"
+#include "empathy-chat.h"
G_BEGIN_DECLS
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-individual-manager.h"
-
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-smiley-manager.h"
-#include "libempathy-gtk/empathy-sound-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-notify-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-individual-manager.h"
+
+#include "empathy-images.h"
+#include "empathy-geometry.h"
+#include "empathy-smiley-manager.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-notify-manager.h"
#include "empathy-chat-manager.h"
#include "empathy-chat-window.h"
#include "empathy-invite-participant-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Macro to compare guint32 X timestamps, while accounting for wrapping around
*/
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy-gtk/empathy-chat.h"
+#include "empathy-chat.h"
G_BEGIN_DECLS
#include <libnotify/notify.h>
-#include "libempathy/empathy-presence-manager.h"
+#include "empathy-presence-manager.h"
-#include "libempathy-gtk/empathy-theme-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
#include "empathy-chat-manager.h"
#include "empathy-chat-resources.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Exit after $TIMEOUT seconds if not displaying any call window */
#define TIMEOUT 60
#include <glib/gi18n.h>
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-account-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
#include "empathy-chatrooms-window.h"
#include <libsoup/soup.h>
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
#include "empathy-debug-window.h"
#include <glib/gi18n.h>
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
#include "empathy-debug-window.h"
#include <glib/gi18n.h>
-#include "libempathy/empathy-presence-manager.h"
-#include "libempathy/empathy-connection-aggregator.h"
-#include "libempathy/empathy-tp-chat.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-sasl-mechanisms.h"
-
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-sound-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-call-utils.h"
-#include "libempathy-gtk/empathy-subscription-dialog.h"
+#include "empathy-presence-manager.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-tp-chat.h"
+#include "empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-sasl-mechanisms.h"
+
+#include "empathy-images.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-call-utils.h"
+#include "empathy-subscription-dialog.h"
#include "empathy-event-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
#include <glib.h>
#include <glib-object.h>
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
G_BEGIN_DECLS
#include <glib/gi18n.h>
#define DEBUG_FLAG EMPATHY_DEBUG_FT
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-geometry.h"
#include "empathy-ft-manager.h"
#include <glib-object.h>
#include <glib.h>
-#include "libempathy/empathy-ft-handler.h"
+#include "empathy-ft-handler.h"
G_BEGIN_DECLS
#include "empathy-import-widget.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
enum {
PROP_PARENT = 1,
#ifndef __EMPATHY_IMPORT_DIALOG_H__
#define __EMPATHY_IMPORT_DIALOG_H__
-#include "libempathy/empathy-connection-managers.h"
+#include "empathy-connection-managers.h"
G_BEGIN_DECLS
#include "empathy-import-pidgin.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
/* Pidgin to CM map */
typedef struct
* Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
*/
-#include "libempathy/empathy-connection-managers.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-connection-managers.h"
+#include "empathy-utils.h"
#include "empathy-import-utils.h"
#include "empathy-import-pidgin.h"
#include "empathy-import-widget.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
#include <glib/gi18n-lib.h>
#include <glib-object.h>
-#include "libempathy/empathy-connection-managers.h"
+#include "empathy-connection-managers.h"
#include "empathy-import-utils.h"
#include "empathy-invite-participant-dialog.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-contact-chooser.h"
+#include "empathy-contact-chooser.h"
G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-tp-chat.h"
G_BEGIN_DECLS
#include "empathy-mic-monitor.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
struct _EmpathyMicMenuPrivate
{
#include "empathy-mic-monitor.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
enum
{
#include <glib/gi18n.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-gsettings.h"
-#include "libempathy-gtk/empathy-account-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
#include "empathy-new-chatroom-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog,
GTK_TYPE_DIALOG)
#include <glib/gi18n.h>
-#include "libempathy-gtk/empathy-notify-manager.h"
-#include "libempathy-gtk/empathy-call-utils.h"
+#include "empathy-notify-manager.h"
+#include "empathy-call-utils.h"
#include "empathy-event-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-notifications-approver.h"
#include <glib/gi18n.h>
-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-client-factory.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-theme-manager.h"
-#include "libempathy-gtk/empathy-spell.h"
+#include "empathy-ui-utils.h"
+#include "empathy-theme-manager.h"
+#include "empathy-spell.h"
#include "empathy-preferences.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
#include <sys/stat.h>
#include <glib/gi18n.h>
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-status-presets.h"
-#include "libempathy/empathy-presence-manager.h"
-
-#include "libempathy-gtk/empathy-contact-blocking-dialog.h"
-#include "libempathy-gtk/empathy-contact-search-dialog.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-gtk-enum-types.h"
-#include "libempathy-gtk/empathy-individual-dialogs.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-new-message-dialog.h"
-#include "libempathy-gtk/empathy-new-call-dialog.h"
-#include "libempathy-gtk/empathy-log-window.h"
-#include "libempathy-gtk/empathy-presence-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-gsettings.h"
+#include "empathy-status-presets.h"
+#include "empathy-presence-manager.h"
+
+#include "empathy-contact-blocking-dialog.h"
+#include "empathy-contact-search-dialog.h"
+#include "empathy-geometry.h"
+#include "empathy-gtk-enum-types.h"
+#include "empathy-individual-dialogs.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-log-window.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
#include "empathy-accounts-dialog.h"
#include "empathy-call-observer.h"
#include "empathy-ft-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Flashing delay for icons (milliseconds). */
#define FLASH_TIMEOUT 500
#include "empathy-sanity-cleaning.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-gsettings.h"
-#include "libempathy-gtk/empathy-theme-manager.h"
+#include "empathy-theme-manager.h"
#ifdef HAVE_UOA
-#include "libempathy/empathy-pkg-kit.h"
-#include "libempathy/empathy-uoa-utils.h"
+#include "empathy-pkg-kit.h"
+#include "empathy-uoa-utils.h"
#include <libaccounts-glib/ag-account-service.h>
#include <libaccounts-glib/ag-manager.h>
#endif
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/*
* This number has to be increased each time a new task is added or modified.
#include "config.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
-#include "libempathy-gtk/empathy-presence-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-new-message-dialog.h"
-#include "libempathy-gtk/empathy-new-call-dialog.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-new-call-dialog.h"
#include "empathy-status-icon.h"
#include "empathy-event-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
/* Number of ms to wait when blinking */
#define BLINK_TIMEOUT 500
#endif
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#include "empathy-video-src.h"
#include <libnotify/notify.h>
-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-connection-aggregator.h"
-#include "libempathy/empathy-presence-manager.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-ft-factory.h"
-#include "libempathy/empathy-gsettings.h"
-
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-location-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-ft-factory.h"
+#include "empathy-gsettings.h"
+
+#include "empathy-ui-utils.h"
+#include "empathy-location-manager.h"
#include "empathy-roster-window.h"
#include "empathy-accounts-common.h"
#include "empathy-notifications-approver.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
#define EMPATHY_DBUS_NAME "org.gnome.Empathy"
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/libempathy-gtk \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DGCR_API_SUBJECT_TO_CHANGE \
$(EMPATHY_CFLAGS) \
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy/empathy-chatroom-manager.h"
+#include "empathy-chatroom-manager.h"
#include "test-helper.h"
#include "test-helper.h"
-#include "libempathy/empathy-chatroom.h"
+#include "empathy-chatroom.h"
#if 0
static EmpathyChatroom *
#include "test-irc-helper.h"
#include "test-helper.h"
-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-irc-network-manager.h"
#define GLOBAL_SAMPLE "default-irc-networks-sample.xml"
#define USER_SAMPLE "user-irc-networks-sample.xml"
#include "test-irc-helper.h"
#include "test-helper.h"
-#include "libempathy/empathy-irc-network.h"
+#include "empathy-irc-network.h"
static void
test_empathy_irc_network_new (void)
#include "test-irc-helper.h"
#include "test-helper.h"
-#include "libempathy/empathy-irc-server.h"
+#include "empathy-irc-server.h"
static void
test_empathy_irc_server_new (void)
#include "test-helper.h"
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
-#include "libempathy-gtk/empathy-live-search.h"
+#include "empathy-live-search.h"
typedef struct
{
#include <telepathy-glib/telepathy-glib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
-#include "libempathy-gtk/empathy-string-parser.h"
+#include "empathy-string-parser.h"
static void
test_replace_match (const gchar *text,
#include <stdio.h>
#include <string.h>
-#include "libempathy/empathy-tls-verifier.h"
+#include "empathy-tls-verifier.h"
#include "test-helper.h"
#include "mock-pkcs11.h"
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/libempathy-gtk \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
$(WARN_CFLAGS) \
#include <glib.h>
#include <gtk/gtk.h>
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-log-window.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
+#include "empathy-log-window.h"
+#include "empathy-ui-utils.h"
static void
destroy_cb (GtkWidget *dialog,
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-account-chooser.h"
static void
filter_func (TpAccount *account,
#include "config.h"
-#include "libempathy-gtk/empathy-calendar-button.h"
+#include "empathy-calendar-button.h"
static void
date_changed_cb (EmpathyCalendarButton *button,
#include <gtk/gtk.h>
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-client-factory.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-contact-blocking-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-contact-blocking-dialog.h"
static void
am_prepare_cb (GObject *source,
#include <config.h>
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static void
individual_activated_cb (EmpathyRosterView *self,
#include <gtk/gtk.h>
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-status-presets.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-presence-chooser.h"
int
main (int argc, char **argv)
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-protocol-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-protocol-chooser.h"
int
main (int argc,
#include <config.h>
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-aggregator.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-aggregator.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static gboolean show_offline = FALSE;
static gboolean show_groups = FALSE;
#include <config.h>
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static gboolean show_offline = FALSE;
static gboolean show_groups = FALSE;
#include <gtk/gtk.h>
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-status-presets.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-status-preset-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-status-preset-dialog.h"
int
main (int argc, char **argv)
#include <glib-object.h>
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
#include "test-helper.h"
#include <stdlib.h>
#include <string.h>
-#include "libempathy/empathy-irc-server.h"
-#include "libempathy/empathy-irc-network.h"
-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-irc-server.h"
+#include "empathy-irc-network.h"
+#include "empathy-irc-network-manager.h"
#ifndef __CHECK_IRC_HELPER_H__
#define __CHECK_IRC_HELPER_H__
INCLUDES = \
-I$(top_builddir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/libempathy-gtk \
-DLOCALEDIR=\""$(datadir)/locale"\" \
$(UOA_CFLAGS) \
$(WARN_CFLAGS) \
#include <libaccounts-glib/ag-service.h>
#include <libaccounts-glib/ag-account-service.h>
-#include "libempathy-gtk/empathy-account-widget.h"
+#include "empathy-account-widget.h"
G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX)
#include "empathy-accounts-plugin.h"
-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-uoa-utils.h"
+#include "empathy-client-factory.h"
+#include "empathy-uoa-utils.h"
#include "empathy-accounts-plugin-widget.h"
#include <libaccounts-glib/ag-manager.h>
#include <libaccounts-glib/ag-provider.h>
-#include "libempathy/empathy-contact.h"
-#include "libempathy-gtk/empathy-user-info.h"
+#include "empathy-contact.h"
+#include "empathy-user-info.h"
#include "empathy-app-plugin-widget.h"
#include "empathy-app-plugin.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-client-factory.h"
#include "empathy-app-plugin-widget.h"