#ifndef __EMP_EXTENSIONS_H__
#define __EMP_EXTENSIONS_H__
-#include <glib-object.h>
#include <telepathy-glib/telepathy-glib.h>
#include "extensions/_gen/enums.h"
*/
#include "config.h"
-
-#include <telepathy-glib/telepathy-glib.h>
+#include "mcp-account-manager-goa.h"
#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
#include <goa/goa.h>
-#include "mcp-account-manager-goa.h"
-
#define DEBUG g_debug
#define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
#define DECLARE_GASYNC_CALLBACK(name) \
* Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
-#include <mission-control-plugins/mission-control-plugins.h>
+#include "config.h"
#include "mcp-account-manager-goa.h"
<info>
<link type="guide" xref="index#contacts"/>
- <link type="seealso" xref="offline-contacts"/>
+ <link type="seealso" xref="hide-contacts"/>
<desc>Add someone to the contact list.</desc>
<revision pkgversion="2.28" version="0.1" date="2009-06-15" status="draft"/>
<revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review">
<page xmlns="http://projectmallard.org/1.0/"
xmlns:e="http://projectmallard.org/experimental/"
+ xmlns:its="http://www.w3.org/2005/11/its"
type="guide"
id="index">
</info>
<title>
- <media type="image" mime="image/png" src="figures/empathy-logo.png">
- Empathy Internet Messenger logo
+ <media type="image" mime="image/png" src="figures/empathy-logo.png" its:translate="no">
+ <span its:translate="yes">Empathy Internet Messenger logo</span>
</media>
Empathy Internet Messenger
</title>
+empathy-account-widgets-resources.[ch]
empathy-gtk-marshal.*
*.gladep
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 \
$(DISABLE_DEPRECATED)
BUILT_SOURCES = \
+ empathy-account-widgets-resources.c \
+ empathy-account-widgets-resources.h \
empathy-gtk-enum-types.h \
empathy-gtk-enum-types.c
include $(top_srcdir)/tools/check-coding-style.mk
check-local: check-coding-style
-uidir = $(datadir)/empathy
-ui_DATA = \
- empathy-contact-widget.ui \
- empathy-contact-blocking-dialog.ui \
+account_widgets_ui_files = \
empathy-account-widget-generic.ui \
empathy-account-widget-jabber.ui \
empathy-account-widget-msn.ui \
empathy-account-widget-yahoo.ui \
empathy-account-widget-groupwise.ui \
empathy-account-widget-aim.ui \
+ $(NULL)
+
+uidir = $(datadir)/empathy
+ui_DATA = \
+ empathy-contact-widget.ui \
+ empathy-contact-blocking-dialog.ui \
empathy-status-preset-dialog.ui \
empathy-log-window.ui \
empathy-chat.ui \
--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 \
&& cp xgen-gtc $(@F) \
&& rm -f xgen-gtc
-EXTRA_DIST = \
+account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml)
+
+empathy-account-widgets-resources.c: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-account-widgets-resources.h: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
+
+EXTRA_DIST = \
+ empathy-account-widgets.gresource.xml \
+ $(account_widgets_ui_files) \
$(ui_DATA)
if HAVE_GEOCLUE
*/
#include "config.h"
+#include "empathy-account-chooser.h"
#include <glib/gi18n-lib.h>
#include "empathy-ui-utils.h"
-#include "empathy-account-chooser.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/**
* SECTION:empathy-account-chooser
#define __EMPATHY_ACCOUNT_CHOOSER_H__
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-account-selector-dialog.h"
enum
*/
#include "config.h"
+#include "empathy-account-widget-irc.h"
#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-irc.h"
#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;
settings = g_slice_new0 (EmpathyAccountWidgetIrc);
settings->self = self;
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"table_irc_settings", table_common_settings,
"vbox_irc", box,
"table_irc_settings", &settings->vbox_settings,
settings = g_slice_new0 (EmpathyAccountWidgetIrc);
settings->self = self;
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_irc_simple", box,
"alignment_network_simple", &alignment,
NULL);
#ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
#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 <glib.h>
-#include <gtk/gtk.h>
+#include "empathy-account-widget.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-account-widget-sip.h"
#include <glib/gi18n-lib.h>
#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
#include "empathy-ui-utils.h"
typedef struct {
if (is_simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_sip_simple", &vbox_settings,
NULL);
settings = g_slice_new0 (EmpathyAccountWidgetSip);
settings->self = self;
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", grid_common_settings,
"grid_advanced_sip_settings", &grid_advanced,
"vbox_sip_settings", &vbox_settings,
#ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_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 "config.h"
+#include "empathy-account-widget.h"
+#include "empathy-account-widget-private.h"
#include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-utils.h>
-
#include <dbus/dbus-protocol.h>
+#include "empathy-account-widget-irc.h"
#include "empathy-account-widget-private.h"
#include "empathy-account-widget-sip.h"
-#include "empathy-account-widget-irc.h"
#include "empathy-ui-utils.h"
+#include "empathy-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)
{
GtkWidget *expander_advanced, *box;
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_generic_settings", &box,
"expander_advanced_settings", &expander_advanced,
{
GtkWidget *expander_advanced, *box;
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_salut_settings", &box,
"expander_advanced_settings", &expander_advanced,
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_msn_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_msn_settings", &self->priv->grid_common_settings,
"vbox_msn_settings", &box,
NULL);
if (self->priv->simple && service == NO_SERVICE)
{
/* Simple widget for XMPP */
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_jabber_simple", &box,
"label_id_simple", &label_id,
"label_id_create", &label_id_create,
else if (self->priv->simple && service == GTALK_SERVICE)
{
/* Simple widget for Google Talk */
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_gtalk_simple", &box,
NULL);
else if (self->priv->simple && service == FACEBOOK_SERVICE)
{
/* Simple widget for Facebook */
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_fb_simple", &box,
"entry_id_fb_simple", &entry_id,
NULL);
ServiceInfo info = services_infos[service];
/* Full widget for XMPP, Google Talk and Facebook*/
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_jabber_settings", &box,
"spinbutton_port", &spinbutton_port,
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_icq_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_icq_settings", &box,
"spinbutton_port", &spinbutton_port,
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_aim_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_aim_settings", &box,
"spinbutton_port", &spinbutton_port,
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_yahoo_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_yahoo_settings", &box,
NULL);
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_groupwise_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_groupwise_settings", &self->priv->grid_common_settings,
"vbox_groupwise_settings", &box,
NULL);
}
#define WIDGET(cm, proto) \
- { #cm, #proto, "empathy-account-widget-"#proto".ui", \
+ { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-"#proto".ui", \
account_widget_build_##proto }
static void
const char *file;
GtkWidget * (*func)(EmpathyAccountWidget *self, const gchar *filename);
} widgets [] = {
- { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui",
+ { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-local-xmpp.ui",
account_widget_build_salut },
WIDGET (gabble, jabber),
WIDGET (haze, msn),
if (!tp_strdiff (widgets[i].cm_name, cm_name) &&
!tp_strdiff (widgets[i].protocol, protocol))
{
- gchar *filename;
-
- filename = empathy_file_lookup (widgets[i].file,
- "libempathy-gtk");
- box = widgets[i].func (self, filename);
- g_free (filename);
-
+ box = widgets[i].func (self, widgets[i].file);
break;
}
}
if (i == G_N_ELEMENTS (widgets))
{
- gchar *filename = empathy_file_lookup (
- "empathy-account-widget-generic.ui", "libempathy-gtk");
+ gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-generic.ui";
box = account_widget_build_generic (self, filename);
- g_free (filename);
}
gtk_container_add (GTK_CONTAINER (self), box);
#include <gtk/gtk.h>
-#include <libempathy/empathy-account-settings.h>
+#include "empathy-account-settings.h"
G_BEGIN_DECLS
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/AccountWidgets">
+ <file compressed="true">empathy-account-widget-generic.ui</file>
+ <file compressed="true">empathy-account-widget-jabber.ui</file>
+ <file compressed="true">empathy-account-widget-msn.ui</file>
+ <file compressed="true">empathy-account-widget-sip.ui</file>
+ <file compressed="true">empathy-account-widget-local-xmpp.ui</file>
+ <file compressed="true">empathy-account-widget-irc.ui</file>
+ <file compressed="true">empathy-account-widget-icq.ui</file>
+ <file compressed="true">empathy-account-widget-yahoo.ui</file>
+ <file compressed="true">empathy-account-widget-groupwise.ui</file>
+ <file compressed="true">empathy-account-widget-aim.ui</file>
+ </gresource>
+</gresources>
+
*/
#include "config.h"
+#include "empathy-avatar-chooser.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-avatar-chooser.h"
-#include "empathy-images.h"
-#include "empathy-ui-utils.h"
-
#ifdef HAVE_CHEESE
#include <cheese-avatar-chooser.h>
#endif /* HAVE_CHEESE */
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/**
* SECTION:empathy-avatar-chooser
#include <gio/gio.h>
#include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-avatar-image.h"
#include <glib/gi18n-lib.h>
#include <gdk/gdkx.h>
-#include <libempathy/empathy-utils.h>
-#include "empathy-avatar-image.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
/**
* SECTION:empathy-avatar-image
#include <gtk/gtk.h>
+#include "empathy-contact.h"
+
G_BEGIN_DECLS
#define EMPATHY_TYPE_AVATAR_IMAGE (empathy_avatar_image_get_type ())
*/
#include "config.h"
-
#include "empathy-bad-password-dialog.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)
#ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__
#define __EMPATHY_BAD_PASSWORD_DIALOG_H__
-#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 "config.h"
-
#include "empathy-base-password-dialog.h"
#include <glib/gi18n-lib.h>
+#include "empathy-utils.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
GTK_TYPE_MESSAGE_DIALOG)
#ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__
#define __EMPATHY_BASE_PASSWORD_DIALOG_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
*/
#include "config.h"
+#include "empathy-calendar-button.h"
#include <glib/gi18n-lib.h>
-#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)
#ifndef __EMPATHY_CALENDAR_BUTTON_H__
#define __EMPATHY_CALENDAR_BUTTON_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-call-utils.h"
#include <glib/gi18n-lib.h>
-
#include <gtk/gtk.h>
-#include <telepathy-glib/telepathy-glib.h>
-
-#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)
#ifndef __EMPATHY_CALL_UTILS_H__
#define __EMPATHY_CALL_UTILS_H__
+#include <telepathy-glib/telepathy-glib.h>
+
G_BEGIN_DECLS
/* Calls */
*/
#include "config.h"
-
-#include <libempathy/empathy-utils.h>
-
#include "empathy-cell-renderer-activatable.h"
+#include "empathy-utils.h"
+
enum {
PATH_ACTIVATED,
LAST_SIGNAL
* Authors: Kristian Rietveld <kris@imendio.com>
*/
-#include <libempathy/empathy-utils.h>
+#include "config.h"
#include "empathy-cell-renderer-expander.h"
+#include "empathy-utils.h"
+
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)
typedef struct {
GtkExpanderStyle expander_style;
*/
#include "config.h"
-
-#include <libempathy/empathy-utils.h>
#include "empathy-cell-renderer-text.h"
+#include "empathy-utils.h"
+
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
typedef struct {
gchar *name;
* Xavier Claessens <xclaesse@gmail.com>
*/
-#include "config.h"
/* for GCompletion */
#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#include <glib/gi18n-lib.h>
+#include "config.h"
+#include "empathy-chat.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 <glib/gi18n-lib.h>
-#include "empathy-chat.h"
-#include "empathy-spell.h"
+#include "empathy-client-factory.h"
+#include "empathy-gsettings.h"
#include "empathy-individual-information-dialog.h"
#include "empathy-individual-store-channel.h"
#include "empathy-individual-view.h"
#include "empathy-input-text-view.h"
+#include "empathy-keyring.h"
+#include "empathy-request-util.h"
#include "empathy-search-bar.h"
-#include "empathy-theme-manager.h"
#include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
+#include "empathy-spell.h"
#include "empathy-string-parser.h"
-#include "extensions/extensions.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 <libempathy-gtk/empathy-theme-adium.h>
+#include "empathy-contact.h"
+#include "empathy-theme-adium.h"
+#include "empathy-tp-chat.h"
G_BEGIN_DECLS
*
* Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
+
#include "config.h"
+#include "empathy-contact-blocking-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-contact-blocking-dialog.h"
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 "config.h"
-
#include "empathy-contact-chooser.h"
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-individual-store-manager.h>
-#include <libempathy-gtk/empathy-individual-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-client-factory.h"
+#include "empathy-individual-store-manager.h"
+#include "empathy-individual-view.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyContactChooser,
empathy_contact_chooser, GTK_TYPE_BOX);
* Danielle Madeley <danielle.madeley@collabora.co.uk>
* Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
*/
+
#include "config.h"
+#include "empathy-contact-search-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-cell-renderer-text.h>
-#include <libempathy-gtk/empathy-cell-renderer-activatable.h>
-#include <libempathy-gtk/empathy-individual-information-dialog.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "empathy-account-chooser.h"
+#include "empathy-cell-renderer-activatable.h"
+#include "empathy-cell-renderer-text.h"
+#include "empathy-client-factory.h"
+#include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
#include "empathy-contact-search-dialog.h"
*/
#include "config.h"
+#include "empathy-contact-widget.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include "empathy-contact-widget.h"
#include "empathy-avatar-image.h"
+#include "empathy-client-factory.h"
#include "empathy-groups-widget.h"
-#include "empathy-ui-utils.h"
#include "empathy-string-parser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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-account-chooser.h"
+#include "empathy-contact.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-contactinfo-utils.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-request-util.h>
-
-#include "empathy-contactinfo-utils.h"
+#include "empathy-request-util.h"
#include "empathy-string-parser.h"
+#include "empathy-time.h"
#include "empathy-ui-utils.h"
static gchar *
#ifndef __EMPATHY_CONTACTINFO_UTILS_H__
#define __EMPATHY_CONTACTINFO_UTILS_H__
-#include <glib.h>
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
* Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
*/
-
#include "config.h"
-
#include "empathy-dialpad-button.h"
G_DEFINE_TYPE (EmpathyDialpadButton, empathy_dialpad_button, GTK_TYPE_BUTTON)
#define __EMPATHY_DIALPAD_BUTTON_H__
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-dialpad-widget.h"
-#include <libempathy-gtk/empathy-dialpad-button.h>
+#include "empathy-dialpad-button.h"
G_DEFINE_TYPE (EmpathyDialpadWidget, empathy_dialpad_widget, GTK_TYPE_BOX);
*/
#include "config.h"
+#include "empathy-geometry.h"
#include <sys/stat.h>
-#include "libempathy/empathy-utils.h"
-#include "empathy-geometry.h"
#include "empathy-ui-utils.h"
+#include "empathy-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)
#ifndef __EMPATHY_GEOMETRY_H__
#define __EMPATHY_GEOMETRY_H__
-#include <glib.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-groups-widget.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-aggregator.h>
-
-#include "empathy-groups-widget.h"
+#include "empathy-utils.h"
+#include "empathy-connection-aggregator.h"
/**
* SECTION:empathy-groups-widget
#define __EMPATHY_GROUPS_WIDGET_H__
#include <gtk/gtk.h>
-
#include <folks/folks.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-individual-dialogs.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-dialogs.h"
#include "empathy-contact-widget.h"
+#include "empathy-individual-manager.h"
+#include "empathy-utils.h"
#define BULLET_POINT "\342\200\242"
#define __EMPATHY_INDIVIDUAL_DIALOGS_H__
#include <gtk/gtk.h>
-
#include <folks/folks.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-individual-edit-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-edit-dialog.h"
#include "empathy-individual-widget.h"
+#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog)
#define __EMPATHY_INDIVIDUAL_EDIT_DIALOG_H__
#include <gtk/gtk.h>
-
#include <folks/folks.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-individual-information-dialog.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-information-dialog.h"
+#include "empathy-individual-manager.h"
#include "empathy-individual-widget.h"
+#include "empathy-pkg-kit.h"
#include "empathy-ui-utils.h"
+#include "empathy-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 {
#define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
#include <gtk/gtk.h>
-
#include <folks/folks.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-individual-menu.h"
#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-account-selector-dialog.h"
+#include "empathy-call-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gtk-enum-types.h"
#include "empathy-images.h"
-#include "empathy-log-window.h"
#include "empathy-individual-dialogs.h"
-#include "empathy-gtk-enum-types.h"
#include "empathy-individual-dialogs.h"
#include "empathy-individual-edit-dialog.h"
-#include "empathy-ui-utils.h"
-#include "empathy-share-my-desktop.h"
-#include "empathy-call-utils.h"
-#include "empathy-individual-store-channel.h"
#include "empathy-individual-information-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-individual-store-channel.h"
+#include "empathy-log-window.h"
+#include "empathy-request-util.h"
+#include "empathy-share-my-desktop.h"
+#include "empathy-ui-utils.h"
+#include "empathy-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, EmpathyIndividualMenu)
*/
#include "config.h"
-
-#include <libempathy/empathy-utils.h>
-
#include "empathy-individual-store-channel.h"
+#include "empathy-utils.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
struct _EmpathyIndividualStoreChannelPriv
{
#define __EMPATHY_INDIVIDUAL_STORE_CHANNEL_H__
#include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.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 "config.h"
-
#include "empathy-individual-store-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
struct _EmpathyIndividualStoreManagerPriv
{
#ifndef __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
#define __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
-#include <gtk/gtk.h>
+#include <glib-object.h>
-#include <libempathy/empathy-individual-manager.h>
-
-#include <libempathy-gtk/empathy-individual-store.h>
+#include "empathy-individual-manager.h"
+#include "empathy-individual-store.h"
G_BEGIN_DECLS
#define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER (empathy_individual_store_manager_get_type ())
*/
#include "config.h"
+#include "empathy-individual-store.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-ui-utils.h"
#include "empathy-gtk-enum-types.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 "config.h"
+#include "empathy-individual-view.h"
#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-individual-edit-dialog.h"
-#include "empathy-images.h"
+#include "empathy-cell-renderer-activatable.h"
#include "empathy-cell-renderer-expander.h"
#include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
-#include "empathy-ui-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-contact-groups.h"
#include "empathy-gtk-enum-types.h"
+#include "empathy-images.h"
+#include "empathy-individual-edit-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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).
#define __EMPATHY_INDIVIDUAL_VIEW_H__
#include <gtk/gtk.h>
-
#include <folks/folks.h>
-#include "empathy-live-search.h"
#include "empathy-individual-menu.h"
#include "empathy-individual-store.h"
+#include "empathy-live-search.h"
G_BEGIN_DECLS
#define EMPATHY_TYPE_INDIVIDUAL_VIEW (empathy_individual_view_get_type ())
*/
#include "config.h"
+#include "empathy-individual-widget.h"
#include <glib/gi18n-lib.h>
#include <champlain-gtk/champlain-gtk.h>
#endif
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-location.h>
-#include <libempathy/empathy-time.h>
-
#include "empathy-avatar-image.h"
#include "empathy-contactinfo-utils.h"
#include "empathy-groups-widget.h"
#include "empathy-gtk-enum-types.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/**
* SECTION:empathy-individual-widget
#define __EMPATHY_INDIVIDUAL_WIDGET_H__
#include <gtk/gtk.h>
-
#include <folks/folks.h>
G_BEGIN_DECLS
* Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
*/
+#include "config.h"
#include "empathy-input-text-view.h"
G_DEFINE_TYPE (EmpathyInputTextView, empathy_input_text_view,
*/
#include "config.h"
+#include "empathy-irc-network-chooser-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-irc-network-manager.h>
-
#include "empathy-irc-network-dialog.h"
+#include "empathy-irc-network-manager.h"
#include "empathy-live-search.h"
+#include "empathy-utils.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 "empathy-irc-network-chooser.h"
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-irc-network-manager.h>
-
-#include "empathy-ui-utils.h"
#include "empathy-irc-network-chooser-dialog.h"
+#include "empathy-irc-network-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-irc-network-chooser.h"
+#include "empathy-debug.h"
#define DEFAULT_IRC_NETWORK "irc.gimp.org"
#define DEFAULT_IRC_PORT 6667
#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 "empathy-irc-network-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-
#include "empathy-ui-utils.h"
#include "totem-subtitle-encoding.h"
-#include "empathy-irc-network-dialog.h"
-
typedef struct {
EmpathyIrcNetwork *network;
GtkAdjustment *adjustment;
GtkTreeSelection *selection;
GtkTreeViewColumn *column;
- gchar *filename;
GtkWidget *sw, *toolbar;
GtkStyleContext *context;
dialog->network = network;
g_object_ref (dialog->network);
- filename = empathy_file_lookup ("empathy-account-widget-irc.ui",
- "libempathy-gtk");
- gui = empathy_builder_get_file (filename,
+ gui = empathy_builder_get_resource (ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-irc.ui",
"irc_network_dialog", &dialog->dialog,
"button_close", &dialog->button_close,
"entry_network", &dialog->entry_network,
"scrolledwindow_network_server", &sw,
"toolbar_network_server", &toolbar,
NULL);
- g_free (filename);
store = gtk_list_store_new (4, G_TYPE_OBJECT, G_TYPE_STRING,
G_TYPE_UINT, G_TYPE_BOOLEAN);
#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-live-search.h"
+#include "empathy-utils.h"
+
G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX)
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLiveSearch)
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-account-widget.h"
+#include "empathy-ui-utils.h"
+#include "empathy-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)
#define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-location-manager.h"
#include <geoclue/geoclue-master.h>
-#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 <glib-object.h>
-
G_BEGIN_DECLS
#define EMPATHY_TYPE_LOCATION_MANAGER (empathy_location_manager_get_type ())
*/
#include "config.h"
+#include "empathy-log-window.h"
#include <glib/gi18n-lib.h>
-#include <webkit/webkit.h>
-
#include <telepathy-glib/proxy-subclass.h>
-#include <extensions/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 "empathy-log-window.h"
+#include "action-chain-internal.h"
#include "empathy-account-chooser.h"
#include "empathy-call-utils.h"
-#include "empathy-individual-information-dialog.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
#include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-request-util.h"
#include "empathy-theme-manager.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#include "empathy-webkit-utils.h"
-#include "empathy-geometry.h"
+#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
#define EMPATHY_NS "http://live.gnome.org/Empathy"
#ifndef __EMPATHY_LOG_WINDOW_H__
#define __EMPATHY_LOG_WINDOW_H__
+#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
#include <glib/gi18n-lib.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-account-widget.h"
+#include "empathy-protocol-chooser.h"
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-protocol-chooser.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
GTK_TYPE_DIALOG)
#include <gtk/gtk.h>
-#include <libempathy/empathy-account-settings.h>
+#include "empathy-account-settings.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-new-call-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-call-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-
-#include "empathy-new-call-dialog.h"
-#include "empathy-call-utils.h"
+#include "empathy-debug.h"
static EmpathyNewCallDialog *dialog_singleton = NULL;
#ifndef __EMPATHY_NEW_CALL_DIALOG_H__
#define __EMPATHY_NEW_CALL_DIALOG_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-new-message-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-request-util.h>
+#include "empathy-request-util.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-images.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-
-#include "empathy-new-message-dialog.h"
+#include "empathy-debug.h"
static EmpathyNewMessageDialog *dialog_singleton = NULL;
#ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
#define __EMPATHY_NEW_MESSAGE_DIALOG_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-notify-manager.h"
#include <libnotify/notify.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-gsettings.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-notify-manager.h"
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager)
#ifndef __EMPATHY_NOTIFY_MANAGER_H__
#define __EMPATHY_NOTIFY_MANAGER_H__
-#include <glib-object.h>
-
-#include <libempathy/empathy-contact.h>
-
#include <libnotify/notification.h>
+#include "empathy-contact.h"
+
G_BEGIN_DECLS
#define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS "actions"
*/
#include "config.h"
-
#include "empathy-password-dialog.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)
#ifndef __EMPATHY_PASSWORD_DIALOG_H__
#define __EMPATHY_PASSWORD_DIALOG_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
-#include <libempathy/empathy-server-sasl-handler.h>
-
-#include <libempathy-gtk/empathy-base-password-dialog.h>
+#include "empathy-base-password-dialog.h"
+#include "empathy-server-sasl-handler.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-plist.h"
#include <string.h>
#include <libxml/tree.h>
#include <telepathy-glib/telepathy-glib.h>
-#include "empathy-plist.h"
-
static GValue *empathy_plist_parse_node (xmlNode *a_node);
static GValue *
#ifndef __EMPATHY_PLIST_H__
#define __EMPATHY_PLIST_H__
-#include <glib.h>
#include <glib-object.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-presence-chooser.h"
#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-status-presets.h"
+#include "empathy-utils.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 "config.h"
+#include "empathy-protocol-chooser.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
-
-#include "empathy-protocol-chooser.h"
+#include "empathy-connection-managers.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/**
* SECTION:empathy-protocol-chooser
#ifndef __EMPATHY_PROTOCOL_CHOOSER_H__
#define __EMPATHY_PROTOCOL_CHOOSER_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy/empathy-account-settings.h>
+#include "empathy-account-settings.h"
G_BEGIN_DECLS
#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
#include "empathy-roster-contact.h"
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n-lib.h>
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
#include "config.h"
-
#include "empathy-roster-group.h"
#include <telepathy-glib/telepathy-glib.h>
*/
#include "config.h"
+#include "empathy-roster-model-aggregator.h"
#include <folks/folks-telepathy.h>
-#include "empathy-roster-model-aggregator.h"
-
/**
* SECTION: empathy-roster-model-aggregator
* @title: EmpathyRosterModelAggregator
#define __EMPATHY_ROSTER_MODEL_AGGREGATOR_H__
#include <glib-object.h>
-
#include <folks/folks.h>
#include "empathy-roster-model.h"
*/
#include "config.h"
-
#include "empathy-roster-model-manager.h"
-#include "empathy-roster-model.h"
-
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-roster-model.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
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
-
#include "empathy-roster-model.h"
G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT)
#ifndef __EMPATHY_ROSTER_MODEL_H__
#define __EMPATHY_ROSTER_MODEL_H__
-#include <glib-object.h>
-
#include <folks/folks.h>
G_BEGIN_DECLS
#include "config.h"
-
#include "empathy-roster-view.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-contact-groups.h>
-
-#include <libempathy-gtk/empathy-roster-contact.h>
-#include <libempathy-gtk/empathy-roster-group.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-contact-groups.h"
+#include "empathy-roster-contact.h"
+#include "empathy-roster-group.h"
+#include "empathy-ui-utils.h"
G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX)
#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 <libempathy-gtk/empathy-roster-model.h>
+#include "egg-list-box/egg-list-box.h"
+#include "empathy-live-search.h"
+#include "empathy-roster-model.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-search-bar.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-search-bar.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar)
#ifndef __EMPATHY_SEARCH_BAR_H__
#define __EMPATHY_SEARCH_BAR_H__
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>
#include "empathy-theme-adium.h"
*/
#include "config.h"
+#include "empathy-share-my-desktop.h"
#define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-share-my-desktop.h"
+#include "empathy-debug.h"
static void
create_tube_channel_cb (GObject *source,
#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-smiley-manager.h"
+
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
typedef struct _SmileyManagerTree SmileyManagerTree;
#ifndef __EMPATHY_SMILEY_MANAGER__H__
#define __EMPATHY_SMILEY_MANAGER_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-sound-manager.h"
#include <glib/gi18n-lib.h>
+#include "empathy-gsettings.h"
+#include "empathy-utils.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"
typedef struct {
EmpathySound sound_id;
#ifndef __EMPATHY_SOUND_MANAGER_H__
#define __EMPATHY_SOUND_MANAGER_H__
-#include <gtk/gtk.h>
-
#include <canberra-gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-spell.h"
#include <glib/gi18n-lib.h>
#include <enchant.h>
#endif
-#include "empathy-spell.h"
+#include "empathy-gsettings.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-gsettings.h>
+#include "empathy-debug.h"
#ifdef HAVE_ENCHANT
*/
#include "config.h"
+#include "empathy-status-preset-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-status-presets.h>
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-ui-utils.h"
-#include "empathy-status-preset-dialog.h"
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusPresetDialog)
#ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__
#define __EMPATHY_STATUS_PRESET_DIALOG_H__
-#include <glib.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-string-parser.h"
+
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
*/
#include "config.h"
-
#include "empathy-subscription-dialog.h"
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-individual-widget.h>
-
#include <glib/gi18n-lib.h>
+#include "empathy-individual-widget.h"
+#include "empathy-utils.h"
+
G_DEFINE_TYPE (EmpathySubscriptionDialog, empathy_subscription_dialog, GTK_TYPE_MESSAGE_DIALOG)
enum
*/
#include "config.h"
+#include "empathy-theme-adium.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-theme-adium.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
+#include "empathy-plist.h"
#include "empathy-smiley-manager.h"
+#include "empathy-time.h"
#include "empathy-ui-utils.h"
-#include "empathy-plist.h"
-#include "empathy-images.h"
+#include "empathy-utils.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 "config.h"
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-gsettings.h>
-
#include "empathy-theme-manager.h"
+#include "empathy-gsettings.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
struct _EmpathyThemeManagerPriv
{
#ifndef __EMPATHY_THEME_MANAGER_H__
#define __EMPATHY_THEME_MANAGER_H__
-#include <glib-object.h>
#include "empathy-theme-adium.h"
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-tls-dialog.h"
#include <glib/gi18n-lib.h>
#include <gcr/gcr.h>
+#include "empathy-utils.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog,
GTK_TYPE_MESSAGE_DIALOG)
#ifndef __EMPATHY_TLS_DIALOG_H__
#define __EMPATHY_TLS_DIALOG_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-ui-utils.h"
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
#include <glib/gi18n-lib.h>
#include <gio/gdesktopappinfo.h>
-#include "empathy-ui-utils.h"
+#include "empathy-ft-factory.h"
#include "empathy-images.h"
#include "empathy-live-search.h"
+#include "empathy-utils.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"
void
empathy_gtk_init (void)
initialized = TRUE;
}
+enum _BuilderSource
+{
+ BUILDER_SOURCE_FILE,
+ BUILDER_SOURCE_RESOURCE
+};
+
static GtkBuilder *
-builder_get_file_valist (const gchar *filename,
+builder_get_valist (const gchar *sourcename,
+ enum _BuilderSource source,
const gchar *first_object,
va_list args)
{
const gchar *name;
GObject **object_ptr;
GError *error = NULL;
+ gboolean success;
- DEBUG ("Loading file %s", filename);
+ DEBUG ("Loading %s '%s'", source == BUILDER_SOURCE_FILE ? "file" : "resource", sourcename);
gui = gtk_builder_new ();
gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE);
- if (!gtk_builder_add_from_file (gui, filename, &error))
+ switch (source)
+ {
+ case BUILDER_SOURCE_FILE:
+ success = gtk_builder_add_from_file (gui, sourcename, &error);
+ break;
+ case BUILDER_SOURCE_RESOURCE:
+ success = gtk_builder_add_from_resource (gui, sourcename, &error);
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ if (!success)
{
g_critical ("GtkBuilder Error (%s): %s",
- filename, error->message);
+ sourcename, error->message);
g_clear_error (&error);
g_object_unref (gui);
va_list args;
va_start (args, first_object);
- gui = builder_get_file_valist (filename, first_object, args);
+ gui = builder_get_valist (filename, BUILDER_SOURCE_FILE, first_object, args);
+ va_end (args);
+
+ return gui;
+}
+
+GtkBuilder *
+empathy_builder_get_resource (const gchar *resourcename,
+ const gchar *first_object,
+ ...)
+{
+ GtkBuilder *gui;
+ va_list args;
+
+ va_start (args, first_object);
+ gui = builder_get_valist (resourcename, BUILDER_SOURCE_RESOURCE, first_object, args);
va_end (args);
return gui;
#define __EMPATHY_UI_UTILS_H__
#include <gtk/gtk.h>
-
#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
+#define ACCOUNT_WIDGETS_RESOURCES_PREFIX "/org/gnome/AccountWidgets"
+
#define EMPATHY_RECT_IS_ON_SCREEN(x,y,w,h) ((x) + (w) > 0 && \
(y) + (h) > 0 && \
(x) < gdk_screen_width () && \
GtkBuilder * empathy_builder_get_file (const gchar *filename,
const gchar *first_object,
...);
+GtkBuilder * empathy_builder_get_resource (const gchar *resourcename,
+ const gchar *first_object,
+ ...);
void empathy_builder_connect (GtkBuilder *gui,
gpointer user_data,
const gchar *first_object,
#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-avatar-chooser.h"
#include "empathy-calendar-button.h"
#include "empathy-contactinfo-utils.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyUserInfo, empathy_user_info, GTK_TYPE_GRID)
#define __EMPATHY_USER_INFO_H__
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-webkit-utils.h"
#include <glib/gi18n-lib.h>
-#include "empathy-webkit-utils.h"
#include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
#include "empathy-theme-adium.h"
+#include "empathy-ui-utils.h"
#define BORING_DPI_DEFAULT 96
empathy-chandler-glue.h
+empathy-dtd-resources.[ch]
empathy-marshal.*
empathy-filter-glue.h
tp-stream-engine-gen.h
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I. \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/extensions \
-I$(top_builddir) \
-DDATADIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
$(DISABLE_DEPRECATED)
BUILT_SOURCES = \
+ empathy-dtd-resources.c \
+ empathy-dtd-resources.h \
empathy-enum-types.h \
empathy-enum-types.c
$(UOA_LIBS) \
$(LIBM)
-dtddir = $(datadir)/empathy
-dtd_DATA = \
+dtd_resources_files = \
empathy-status-presets.dtd \
empathy-contact-groups.dtd \
empathy-chatroom-manager.dtd \
ircnetworks_DATA = \
irc-networks.xml
-EXTRA_DIST = \
- $(dtd_DATA) \
+dtd_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/empathy-dtd.gresource.xml)
+
+empathy-dtd-resources.c: empathy-dtd.gresource.xml $(dtd_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-dtd-resources.h: empathy-dtd.gresource.xml $(dtd_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
+
+EXTRA_DIST = \
+ empathy-dtd.gresource.xml \
+ $(dtd_resources_files) \
$(ircnetworks_DATA)
CLEANFILES = \
--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 \
#define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
enum EmpathyCameraDeviceMonitorError
{
*/
#include "config.h"
-
#include "empathy-account-settings.h"
+
#include "empathy-connection-managers.h"
#include "empathy-keyring.h"
-#include "empathy-utils.h"
#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings)
#include <glib-object.h>
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-auth-factory.h"
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
#include "empathy-keyring.h"
#include "empathy-sasl-mechanisms.h"
#include "empathy-server-sasl-handler.h"
#include "empathy-uoa-auth-handler.h"
#endif /* HAVE_UOA */
-#include "extensions/extensions.h"
+#include "extensions.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
#define __EMPATHY_AUTH_FACTORY_H__
#include <glib-object.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-camera-monitor.h"
+
#include "cheese-camera-device-monitor.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
*/
#include "config.h"
+#include "empathy-chatroom-manager.h"
#include <sys/stat.h>
#include "empathy-client-factory.h"
-#include "empathy-chatroom-manager.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
#define CHATROOMS_XML_FILENAME "chatrooms.xml"
-#define CHATROOMS_DTD_FILENAME "empathy-chatroom-manager.dtd"
+#define CHATROOMS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-chatroom-manager.dtd"
#define SAVE_TIMER 4
static EmpathyChatroomManager *chatroom_manager_singleton = NULL;
return FALSE;
}
- if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME))
+ if (!empathy_xml_validate_from_resource (doc, CHATROOMS_DTD_RESOURCENAME))
{
g_warning ("Failed to validate file:'%s'", filename);
xmlFreeDoc (doc);
#define __EMPATHY_CHATROOM_MANAGER_H__
#include <glib-object.h>
-
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-chatroom.h"
*/
#include "config.h"
-
#include "empathy-chatroom.h"
+
#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
#define __EMPATHY_CHATROOM_H__
#include <glib-object.h>
-
#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy/empathy-tp-chat.h>
+#include "empathy-tp-chat.h"
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-client-factory.h"
#include "empathy-tp-chat.h"
*/
#include "config.h"
-
#include "empathy-connection-aggregator.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#define __EMPATHY_CONNECTION_AGGREGATOR_H__
#include <glib-object.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-connection-managers.h"
+
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
static GObject *managers = NULL;
#include <glib-object.h>
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-contact-groups.h"
#include <sys/stat.h>
#include "empathy-utils.h"
-#include "empathy-contact-groups.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
#define CONTACT_GROUPS_XML_FILENAME "contact-groups.xml"
-#define CONTACT_GROUPS_DTD_FILENAME "empathy-contact-groups.dtd"
+#define CONTACT_GROUPS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-contact-groups.dtd"
typedef struct {
gchar *name;
return;
}
- if (!empathy_xml_validate (doc, CONTACT_GROUPS_DTD_FILENAME)) {
+ if (!empathy_xml_validate_from_resource (doc, CONTACT_GROUPS_DTD_RESOURCENAME)) {
g_warning ("Failed to validate file:'%s'", filename);
xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
#ifndef __EMPATHY_CONTACT_GROUPS_H__
#define __EMPATHY_CONTACT_GROUPS_H__
-G_BEGIN_DECLS
-
#include <glib.h>
+G_BEGIN_DECLS
+
void empathy_contact_groups_get_all (void);
gboolean empathy_contact_group_get_expanded (const gchar *group);
*/
#include "config.h"
+#include "empathy-contact.h"
#ifdef HAVE_GEOCODE
#include <geocode-glib/geocode-glib.h>
#define __EMPATHY_CONTACT_H__
#include <glib-object.h>
-
#include <telepathy-glib/telepathy-glib.h>
#include <telepathy-logger/telepathy-logger.h>
#include <folks/folks.h>
*/
#include "config.h"
-
#include "empathy-debug.h"
#ifdef ENABLE_DEBUG
#ifndef __EMPATHY_DEBUG_H__
#define __EMPATHY_DEBUG_H__
-#include "config.h"
-
-
#include <glib.h>
#include <telepathy-glib/telepathy-glib.h>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/Empathy">
+ <file>empathy-status-presets.dtd</file>
+ <file>empathy-contact-groups.dtd</file>
+ <file>empathy-chatroom-manager.dtd</file>
+ <file>empathy-irc-networks.dtd</file>
+ </gresource>
+</gresources>
+
/* empathy-ft-factory.c */
+#include "config.h"
#include "empathy-ft-factory.h"
+
#include "empathy-request-util.h"
#include "empathy-utils.h"
/* empathy-ft-handler.c */
#include "config.h"
+#include "empathy-ft-handler.h"
#include <glib/gi18n-lib.h>
-#include "empathy-ft-handler.h"
#include "empathy-time.h"
#include "empathy-utils.h"
#include <glib-object.h>
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-contact.h"
*/
#include "config.h"
+#include "empathy-goa-auth-handler.h"
#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
#include <goa/goa.h>
+#include "empathy-sasl-mechanisms.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
-#include "empathy-goa-auth-handler.h"
-#include "empathy-sasl-mechanisms.h"
struct _EmpathyGoaAuthHandlerPriv
{
*/
#include "config.h"
-
#include "empathy-individual-manager.h"
+
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
*/
#include "config.h"
+#include "empathy-irc-network-manager.h"
#include <sys/stat.h>
#include "empathy-utils.h"
-#include "empathy-irc-network-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_IRC
#include "empathy-debug.h"
-#define IRC_NETWORKS_DTD_FILENAME "empathy-irc-networks.dtd"
+#define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-irc-networks.dtd"
#define IRC_NETWORKS_FILENAME "irc-networks.xml"
#define SAVE_TIMER 4
return FALSE;
}
- if (!empathy_xml_validate (doc, IRC_NETWORKS_DTD_FILENAME)) {
+ if (!empathy_xml_validate_from_resource (doc, IRC_NETWORKS_DTD_RESOURCENAME)) {
g_warning ("Failed to validate file:'%s'", filename);
xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
*/
#include "config.h"
-
#include "empathy-irc-network.h"
+
#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork)
*/
#include "config.h"
-
#include "empathy-irc-server.h"
+
#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer)
*/
#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
#include "empathy-keyring.h"
+#include <glib/gi18n-lib.h>
#include <libsecret/secret.h>
#ifdef HAVE_UOA
#define __EMPATHY_KEYRING_H__
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-message.h"
#include <glib/gi18n-lib.h>
#include "empathy-client-factory.h"
-#include "empathy-message.h"
#include "empathy-time.h"
#include "empathy-utils.h"
#include "empathy-enum-types.h"
*/
#include "config.h"
-
-#include <libempathy/empathy-pkg-kit.h>
+#include "empathy-pkg-kit.h"
typedef struct
{
*/
#include "config.h"
-
#include "empathy-presence-manager.h"
#include "empathy-utils.h"
#define __EMPATHY_PRESENCE_MANAGER_H__
#include <glib.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-request-util.h"
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
void
empathy_chat_with_contact (EmpathyContact *contact,
#include <glib.h>
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-contact.h"
*/
#include "config.h"
+#include "empathy-sasl-mechanisms.h"
#include <libsoup/soup.h>
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
#include "empathy-utils.h"
-#include "empathy-sasl-mechanisms.h"
#define MECH_FACEBOOK "X-FACEBOOK-PLATFORM"
#define MECH_WLM "X-MESSENGER-OAUTH2"
*/
#include "config.h"
-
#include "empathy-server-sasl-handler.h"
-#include <extensions/extensions.h>
+#include "empathy-keyring.h"
+#include "empathy-sasl-mechanisms.h"
+#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
-#include "empathy-keyring.h"
-#include "empathy-sasl-mechanisms.h"
enum {
PROP_CHANNEL = 1,
#include <glib-object.h>
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-server-tls-handler.h"
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
#include "empathy-utils.h"
+#include "extensions.h"
-#include "extensions/extensions.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
static void async_initable_iface_init (GAsyncInitableIface *iface);
#include <glib-object.h>
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-status-presets.h"
#include <sys/stat.h>
#include "empathy-utils.h"
-#include "empathy-status-presets.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
#define STATUS_PRESETS_XML_FILENAME "status-presets.xml"
-#define STATUS_PRESETS_DTD_FILENAME "empathy-status-presets.dtd"
+#define STATUS_PRESETS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-status-presets.dtd"
#define STATUS_PRESETS_MAX_EACH 15
typedef struct {
return;
}
- if (!empathy_xml_validate (doc, STATUS_PRESETS_DTD_FILENAME)) {
+ if (!empathy_xml_validate_from_resource (doc, STATUS_PRESETS_DTD_RESOURCENAME)) {
g_warning ("Failed to validate file:'%s'", filename);
xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
*/
#include "config.h"
+#include "empathy-time.h"
#include <glib/gi18n-lib.h>
-#include "empathy-time.h"
-
/* Note: EmpathyTime is always in UTC. */
gint64
#define __USE_XOPEN
#endif
#include <time.h>
-
#include <glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-tls-verifier.h"
#include <gcr/gcr.h>
+#include "empathy-utils.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include "empathy-debug.h"
-#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyTLSVerifier, empathy_tls_verifier,
G_TYPE_OBJECT)
#include <glib-object.h>
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-tp-chat.h"
+
#include "empathy-request-util.h"
#include "empathy-utils.h"
#define __EMPATHY_TP_CHAT_H__
#include <glib.h>
-
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-message.h"
*/
#include "config.h"
+#include "empathy-uoa-auth-handler.h"
#include <libaccounts-glib/ag-account.h>
#include <libaccounts-glib/ag-account-service.h>
#include <libsignon-glib/signon-identity.h>
#include <libsignon-glib/signon-auth-session.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "empathy-debug.h"
#include "empathy-keyring.h"
#include "empathy-utils.h"
-#include "empathy-uoa-auth-handler.h"
#include "empathy-uoa-utils.h"
#include "empathy-sasl-mechanisms.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include "empathy-debug.h"
+
struct _EmpathyUoaAuthHandlerPriv
{
AgManager *manager;
*/
#include "config.h"
+#include "empathy-uoa-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include "empathy-debug.h"
-#include "empathy-uoa-utils.h"
static AgManager *singleton = NULL;
*/
#include "config.h"
+#include "empathy-utils.h"
#include <glib/gi18n-lib.h>
-
-#include <libxml/uri.h>
#include <dbus/dbus-protocol.h>
#include "empathy-client-factory.h"
-#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"
}
gboolean
-empathy_xml_validate (xmlDoc *doc,
- const gchar *dtd_filename)
+empathy_xml_validate_from_resource (xmlDoc *doc,
+ const gchar *dtd_resourcename)
{
- gchar *path;
- xmlChar *escaped;
+ GBytes *resourcecontents;
+ gconstpointer resourcedata;
+ gsize resourcesize;
+ xmlParserInputBufferPtr buffer;
xmlValidCtxt cvp;
xmlDtd *dtd;
+ GError *error = NULL;
gboolean ret;
- path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "libempathy",
- dtd_filename, NULL);
- if (!g_file_test (path, G_FILE_TEST_EXISTS))
+ DEBUG ("Loading dtd resource %s", dtd_resourcename);
+
+ resourcecontents = g_resources_lookup_data (dtd_resourcename, G_RESOURCE_LOOKUP_FLAGS_NONE, &error);
+ if (error != NULL)
{
- g_free (path);
- path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL);
+ g_warning ("Unable to load dtd resource '%s': %s", dtd_resourcename, error->message);
+ g_error_free (error);
+ return FALSE;
}
-
- DEBUG ("Loading dtd file %s", path);
-
- /* The list of valid chars is taken from libxml. */
- escaped = xmlURIEscapeStr ((const xmlChar *) path,
- (const xmlChar *)":@&=+$,/?;");
- g_free (path);
+ resourcedata = g_bytes_get_data (resourcecontents, &resourcesize);
+ buffer = xmlParserInputBufferCreateStatic (resourcedata, resourcesize, XML_CHAR_ENCODING_UTF8);
memset (&cvp, 0, sizeof (cvp));
- dtd = xmlParseDTD (NULL, escaped);
+ dtd = xmlIOParseDTD (NULL, buffer, XML_CHAR_ENCODING_UTF8);
ret = xmlValidateDtd (&cvp, doc, dtd);
- xmlFree (escaped);
xmlFreeDtd (dtd);
+ g_bytes_unref (resourcecontents);
return ret;
}
#include <glib.h>
#include <glib-object.h>
-
#include <gnutls/x509.h>
#include <libxml/tree.h>
#include <folks/folks.h>
void empathy_init (void);
/* XML */
-gboolean empathy_xml_validate (xmlDoc *doc,
- const gchar *dtd_filename);
+gboolean empathy_xml_validate_from_resource (xmlDoc *doc,
+ const gchar *dtd_resourcename);
xmlNodePtr empathy_xml_node_get_child (xmlNodePtr node,
const gchar *child_name);
xmlChar * empathy_xml_node_get_child_content (xmlNodePtr node,
INCLUDES = \
-I$(top_builddir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/libempathy-gtk \
-DLOCALEDIR=\""$(datadir)/locale"\" \
$(NST_CFLAGS) \
$(WARN_CFLAGS) \
#include "config.h"
-#include <glib.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-
-#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-debug.h"
+#include "empathy-ft-factory.h"
+
+#include "empathy-roster-model-manager.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) \
CLEANFILES = $(BUILT_SOURCES)
-empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
- --sourcedir=$(srcdir) \
- --generate-source \
- $<
-
-empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
- --sourcedir=$(srcdir) \
- --generate-header \
- $<
+chat_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-chat.gresource.xml)
+
+empathy-chat-resources.c: empathy-chat.gresource.xml $(chat_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-chat-resources.h: empathy-chat.gresource.xml $(chat_resource_files)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
*/
#include "config.h"
+#include "empathy-about-dialog.h"
#include <glib/gi18n.h>
-#include "empathy-about-dialog.h"
-
#define WEB_SITE "http://live.gnome.org/Empathy"
static const char *authors[] = {
*/
#include "config.h"
-
-#include <libempathy-gtk/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)
#ifndef __EMPATHY_ACCOUNTS_COMMON_H__
#define __EMPATHY_ACCOUNTS_COMMON_H__
+#include <telepathy-glib/telepathy-glib.h>
+
+G_BEGIN_DECLS
+
gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager);
gboolean empathy_accounts_has_accounts (TpAccountManager *manager);
TpAccount *account,
GApplication *app);
+G_END_DECLS
+
#endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
*/
#include "config.h"
+#include "empathy-accounts-dialog.h"
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/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-accounts-common.h"
-#include "empathy-accounts-dialog.h"
+#include "empathy-account-widget-sip.h"
#include "empathy-import-dialog.h"
#include "empathy-import-utils.h"
+#include "empathy-local-xmpp-assistant-widget.h"
+#include "empathy-new-account-dialog.h"
+#include "empathy-pkg-kit.h"
+#include "empathy-ui-utils.h"
+#include "empathy-user-info.h"
+#include "empathy-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
#define __EMPATHY_ACCOUNTS_DIALOG_H__
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-accounts.h"
#include <glib/gi18n.h>
#include <cheese-gtk.h>
#endif
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
#include "empathy-accounts-common.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 "config.h"
+#include "empathy-audio-sink.h"
#ifdef HAVE_GST1
#include <gst/audio/streamvolume.h>
#endif
#include "empathy-audio-utils.h"
-#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)
#ifndef __EMPATHY_GST_AUDIO_SINK_H__
#define __EMPATHY_GST_AUDIO_SINK_H__
-#include <glib-object.h>
#include <gst/gst.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-audio-src.h"
#ifdef HAVE_GST1
#include <gst/audio/streamvolume.h>
#include <gst/interfaces/streamvolume.h>
#endif
-#include <libempathy/empathy-utils.h>
#include "empathy-audio-utils.h"
-
-#include "empathy-audio-src.h"
#include "empathy-mic-monitor.h"
+#include "empathy-utils.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)
#ifndef __EMPATHY_GST_AUDIO_SRC_H__
#define __EMPATHY_GST_AUDIO_SRC_H__
-#include <glib-object.h>
#include <gst/gst.h>
#include <gio/gio.h>
*/
#include "config.h"
+#include "empathy-audio-utils.h"
#include <pulse/pulseaudio.h>
-#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 "config.h"
#include <glib/gi18n.h>
+#include <gnutls/gnutls.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-auth-factory.h"
+#include "empathy-bad-password-dialog.h"
+#include "empathy-password-dialog.h"
#include "empathy-sanity-cleaning.h"
+#include "empathy-server-tls-handler.h"
+#include "empathy-tls-dialog.h"
+#include "empathy-tls-verifier.h"
+#include "empathy-ui-utils.h"
-#include <gnutls/gnutls.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
#define TIMEOUT 60
*/
#include "config.h"
-
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-request-util.h>
+#include "empathy-client-factory.h"
#include "empathy-call-factory.h"
#include "empathy-call-handler.h"
+#include "empathy-request-util.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)
#ifndef __EMPATHY_CALL_FACTORY_H__
#define __EMPATHY_CALL_FACTORY_H__
-#include <glib-object.h>
+#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-call-handler.h"
#include <telepathy-farstream/telepathy-farstream.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-call-utils.h>
-
-#include "empathy-call-handler.h"
+#include "empathy-call-utils.h"
+#include "empathy-utils.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)
#ifndef __EMPATHY_CALL_HANDLER_H__
#define __EMPATHY_CALL_HANDLER_H__
-#include <glib-object.h>
-
-#include <gst/gst.h>
#include <farstream/fs-conference.h>
-
#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-call-observer.h"
#include <glib/gi18n-lib.h>
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
-
-#include "empathy-call-observer.h"
+#include "empathy-images.h"
+#include "empathy-notify-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
struct _EmpathyCallObserverPriv {
EmpathyNotifyManager *notify_mgr;
#ifndef __EMPATHY_CALL_OBSERVER_H__
#define __EMPATHY_CALL_OBSERVER_H__
-#include <glib.h>
#include <glib-object.h>
G_BEGIN_DECLS
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include "empathy-call-window-fullscreen.h"
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
/* The number of seconds for which the "leave fullscreen" popup should
be shown */
#ifndef __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
#define __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
-#include <glib-object.h>
-#include <gtk/gtk.h>
#include "empathy-call-window.h"
*/
#include "config.h"
+#include "empathy-call-window.h"
#include <glib/gi18n.h>
-
#include <telepathy-farstream/telepathy-farstream.h>
-
#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>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-call-window-fullscreen.h"
#include "empathy-about-dialog.h"
#include "empathy-audio-sink.h"
+#include "empathy-call-utils.h"
+#include "empathy-call-window-fullscreen.h"
+#include "empathy-camera-menu.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-dialpad-widget.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
#include "empathy-mic-menu.h"
#include "empathy-preferences.h"
+#include "empathy-request-util.h"
#include "empathy-rounded-actor.h"
#include "empathy-rounded-rectangle.h"
#include "empathy-rounded-texture.h"
-#include "empathy-camera-menu.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include "empathy-debug.h"
#define CONTENT_HBOX_SPACING 3
#define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0
#ifndef __EMPATHY_CALL_WINDOW_H__
#define __EMPATHY_CALL_WINDOW_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
-#include "empathy-call-handler.h"
#include "empathy-audio-src.h"
+#include "empathy-call-handler.h"
#include "empathy-video-src.h"
G_BEGIN_DECLS
#include "config.h"
#include <glib/gi18n.h>
-
#include <clutter-gtk/clutter-gtk.h>
#include <clutter-gst/clutter-gst.h>
#include <X11/Xlib.h>
#endif
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-call-window.h"
#include "empathy-call-factory.h"
+#include "empathy-call-window.h"
+#include "empathy-ui-utils.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-menu.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
struct _EmpathyCameraMenuPrivate
{
#ifndef __EMPATHY_CAMERA_MENU_H__
#define __EMPATHY_CAMERA_MENU_H__
-#include <glib-object.h>
#include "empathy-call-window.h"
*/
#include "config.h"
+#include "empathy-chat-manager.h"
#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 <libempathy-gtk/empathy-ui-utils.h>
-
+#include "empathy-chatroom-manager.h"
#include "empathy-chat-window.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-chat-manager.h"
-
-#include <extensions/extensions.h>
+#include "empathy-debug.h"
enum {
CLOSED_CHATS_CHANGED,
#ifndef __EMPATHY_CHAT_MANAGER_H__
#define __EMPATHY_CHAT_MANAGER_H__
-#include <glib-object.h>
-#include <libempathy-gtk/empathy-chat.h>
+#include "empathy-chat.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-chat-window.h"
-#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-chat-manager.h"
-#include "empathy-chat-window.h"
#include "empathy-about-dialog.h"
+#include "empathy-chat-manager.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
#include "empathy-invite-participant-dialog.h"
+#include "empathy-notify-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-smiley-manager.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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
*/
#ifndef __EMPATHY_CHAT_WINDOW_H__
#define __EMPATHY_CHAT_WINDOW_H__
-#include <glib-object.h>
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy-gtk/empathy-chat.h>
+#include "empathy-chat.h"
+#include "empathy-individual-manager.h"
G_BEGIN_DECLS
#include "config.h"
#include <glib/gi18n.h>
-
#include <libnotify/notify.h>
-#include <libempathy/empathy-presence-manager.h>
-
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
#include "empathy-chat-manager.h"
#include "empathy-chat-resources.h"
+#include "empathy-presence-manager.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.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 "config.h"
+#include "empathy-chatrooms-window.h"
#include <glib/gi18n.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-chatrooms-window.h"
+#include "empathy-account-chooser.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
typedef struct {
EmpathyChatroomManager *manager;
*/
#include "config.h"
+#include "empathy-debug-window.h"
#include <glib/gi18n.h>
#include <libsoup/soup.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/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-utils.h"
-#include "empathy-debug-window.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window,
GTK_TYPE_WINDOW)
#ifndef __EMPATHY_DEBUG_WINDOW_H__
#define __EMPATHY_DEBUG_WINDOW_H__
-G_BEGIN_DECLS
-
-#include <glib-object.h>
#include <gtk/gtk.h>
+G_BEGIN_DECLS
+
#define EMPATHY_TYPE_DEBUG_WINDOW (empathy_debug_window_get_type ())
#define EMPATHY_DEBUG_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST \
((object), EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindow))
#include <glib/gi18n.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
#include "empathy-debug-window.h"
+#include "empathy-ui-utils.h"
#define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
*/
#include "config.h"
+#include "empathy-event-manager.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-event-manager.h"
+#include "empathy-call-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
+#include "empathy-presence-manager.h"
+#include "empathy-sasl-mechanisms.h"
+#include "empathy-sound-manager.h"
+#include "empathy-subscription-dialog.h"
+#include "empathy-tp-chat.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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)
#ifndef __EMPATHY_EVENT_MANAGER_H__
#define __EMPATHY_EVENT_MANAGER_H__
-#include <glib.h>
#include <glib-object.h>
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
G_BEGIN_DECLS
/* The original file transfer manager code was copied from Epiphany */
#include "config.h"
+#include "empathy-ft-manager.h"
#include <glib/gi18n.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_FT
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-geometry.h>
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
-#include "empathy-ft-manager.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_FT
+#include "empathy-debug.h"
enum
{
#ifndef __EMPATHY_FT_MANAGER_H__
#define __EMPATHY_FT_MANAGER_H__
-#include <gtk/gtk.h>
#include <glib-object.h>
-#include <glib.h>
-#include <libempathy/empathy-ft-handler.h>
+#include "empathy-ft-handler.h"
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-import-dialog.h"
#include <glib/gi18n-lib.h>
-#include "empathy-import-dialog.h"
#include "empathy-import-widget.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.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 "config.h"
+#include "empathy-import-pidgin.h"
#include <glib/gstdio.h>
#include <dbus/dbus-protocol.h>
#include "empathy-import-utils.h"
-#include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.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 "config.h"
#include "empathy-import-utils.h"
+
+#include "empathy-connection-managers.h"
#include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
EmpathyImportAccountData *
empathy_import_account_data_new (const gchar *source)
#define __EMPATHY_IMPORT_UTILS_H__
#include <telepathy-glib/telepathy-glib.h>
-#include <glib.h>
G_BEGIN_DECLS
/* empathy-import-widget.c */
#include "config.h"
-
-#include "empathy-import-dialog.h"
#include "empathy-import-widget.h"
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n-lib.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
-#include <glib/gi18n-lib.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT)
#ifndef __EMPATHY_IMPORT_WIDGET_H__
#define __EMPATHY_IMPORT_WIDGET_H__
-#include <glib-object.h>
-
-#include <libempathy/empathy-connection-managers.h>
+#include <gtk/gtk.h>
+#include "empathy-connection-managers.h"
#include "empathy-import-utils.h"
G_BEGIN_DECLS
*/
#include "config.h"
-
-#include <glib/gi18n.h>
-
#include "empathy-invite-participant-dialog.h"
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n.h>
-#include <libempathy-gtk/empathy-contact-chooser.h>
+#include "empathy-contact-chooser.h"
+#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
#define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-tp-chat.h"
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-mic-menu.h"
+
#include "empathy-mic-monitor.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
struct _EmpathyMicMenuPrivate
{
*/
#include "config.h"
+#include "empathy-mic-monitor.h"
-#include <gtk/gtk.h>
#include <pulse/glib-mainloop.h>
-#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
{
#ifndef __EMPATHY_MIC_MONITOR_H__
#define __EMPATHY_MIC_MONITOR_H__
-#include <glib-object.h>
-
+#include <gio/gio.h>
#include <pulse/pulseaudio.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-new-chatroom-dialog.h"
#include <glib/gi18n.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-gsettings.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-new-chatroom-dialog.h"
+#include "empathy-account-chooser.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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)
#ifndef __EMPATHY_NEW_CHATROOM_DIALOG_H__
#define __EMPATHY_NEW_CHATROOM_DIALOG_H__
-#include <glib-object.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-notifications-approver.h"
#include <glib/gi18n.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
-#include <libempathy-gtk/empathy-call-utils.h>
-
+#include "empathy-call-utils.h"
#include "empathy-event-manager.h"
+#include "empathy-notify-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-notifications-approver.h"
+#include "empathy-debug.h"
struct _EmpathyNotificationsApproverPrivate
{
*/
#include "config.h"
+#include "empathy-preferences.h"
#include <glib/gi18n.h>
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/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-preferences.h"
+#include "empathy-client-factory.h"
+#include "empathy-gsettings.h"
+#include "empathy-spell.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 "config.h"
+#include "empathy-roster-window.h"
#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-about-dialog.h"
#include "empathy-accounts-dialog.h"
#include "empathy-call-observer.h"
#include "empathy-chat-manager.h"
-#include "empathy-roster-window.h"
-#include "empathy-preferences.h"
-#include "empathy-about-dialog.h"
-#include "empathy-new-chatroom-dialog.h"
+#include "empathy-chatroom-manager.h"
#include "empathy-chatrooms-window.h"
+#include "empathy-contact-blocking-dialog.h"
+#include "empathy-contact-search-dialog.h"
#include "empathy-event-manager.h"
#include "empathy-ft-manager.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
+#include "empathy-gsettings.h"
+#include "empathy-gtk-enum-types.h"
+#include "empathy-individual-dialogs.h"
+#include "empathy-log-window.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-chatroom-dialog.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-preferences.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-presence-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 "config.h"
-
#include "empathy-rounded-actor.h"
G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR)
#ifndef __EMPATHY_ROUNDED_ACTOR_H__
#define __EMPATHY_ROUNDED_ACTOR_H__
-#include <glib-object.h>
#include <clutter-gtk/clutter-gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-rounded-rectangle.h"
#include <math.h>
-#include "empathy-rounded-rectangle.h"
-
G_DEFINE_TYPE (EmpathyRoundedRectangle,
empathy_rounded_rectangle,
CLUTTER_TYPE_CAIRO_TEXTURE)
#ifndef __EMPATHY_ROUNDED_RECTANGLE_H__
#define __EMPATHY_ROUNDED_RECTANGLE_H__
-#include <glib-object.h>
#include <clutter/clutter.h>
G_BEGIN_DECLS
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include "empathy-rounded-texture.h"
G_DEFINE_TYPE (EmpathyRoundedTexture,
#ifndef __EMPATHY_ROUNDED_TEXTURE_H__
#define __EMPATHY_ROUNDED_TEXTURE_H__
-#include <glib-object.h>
#include <clutter/clutter.h>
G_BEGIN_DECLS
*/
#include "config.h"
-
#include "empathy-sanity-cleaning.h"
-#include <libempathy/empathy-gsettings.h>
-
-#include <libempathy-gtk/empathy-theme-manager.h>
-
#ifdef HAVE_UOA
-#include <libempathy/empathy-pkg-kit.h>
-#include <libempathy/empathy-uoa-utils.h>
-
#include <libaccounts-glib/ag-account-service.h>
#include <libaccounts-glib/ag-manager.h>
#include <libaccounts-glib/ag-service.h>
+
+#include "empathy-pkg-kit.h"
+#include "empathy-uoa-utils.h"
#endif
+#include "empathy-gsettings.h"
+#include "empathy-theme-manager.h"
+
#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 <gio/gio.h>
+G_BEGIN_DECLS
+
void empathy_sanity_checking_run_async (GAsyncReadyCallback callback,
gpointer user_data);
gboolean empathy_sanity_checking_run_finish (GAsyncResult *result,
GError **error);
+G_END_DECLS
+
#endif
*/
#include "config.h"
-
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/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-status-icon.h"
+
#include "empathy-event-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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
#ifndef __EMPATHY_STATUS_ICON_H__
#define __EMPATHY_STATUS_ICON_H__
-#include <glib.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
*/
#include "config.h"
+#include "empathy-video-src.h"
#ifdef HAVE_GST1
#include <gst/video/colorbalance.h>
#endif
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-video-src.h"
+#include "empathy-debug.h"
G_DEFINE_TYPE(EmpathyGstVideoSrc, empathy_video_src, GST_TYPE_BIN)
#ifndef __EMPATHY_GST_VIDEO_SRC_H__
#define __EMPATHY_GST_VIDEO_SRC_H__
-#include <glib-object.h>
#include <gst/gst.h>
G_BEGIN_DECLS
#include <glib/gstdio.h>
#include <glib/gi18n.h>
+#include <libnotify/notify.h>
#ifdef HAVE_LIBCHAMPLAIN
#include <clutter-gtk/clutter-gtk.h>
#endif
-#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-roster-window.h"
#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
-#include "empathy-status-icon.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-ft-factory.h"
#include "empathy-ft-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-location-manager.h"
#include "empathy-notifications-approver.h"
+#include "empathy-presence-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-roster-window.h"
+#include "empathy-status-icon.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib/gstdio.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-chatroom-manager.h>
-
+#include "empathy-chatroom-manager.h"
#include "test-helper.h"
#define CHATROOM_SAMPLE "chatrooms-sample.xml"
#include <string.h>
#include "test-helper.h"
-
-#include <libempathy/empathy-chatroom.h>
+#include "empathy-chatroom.h"
#if 0
static EmpathyChatroom *
#include <string.h>
#include <glib/gstdio.h>
-#include "test-irc-helper.h"
+#include "empathy-irc-network-manager.h"
#include "test-helper.h"
-
-#include <libempathy/empathy-irc-network-manager.h>
+#include "test-irc-helper.h"
#define GLOBAL_SAMPLE "default-irc-networks-sample.xml"
#define USER_SAMPLE "user-irc-networks-sample.xml"
#include <stdio.h>
#include <string.h>
-#include "test-irc-helper.h"
+#include "empathy-irc-network.h"
#include "test-helper.h"
-
-#include <libempathy/empathy-irc-network.h>
+#include "test-irc-helper.h"
static void
test_empathy_irc_network_new (void)
#include <stdio.h>
#include <string.h>
-#include "test-irc-helper.h"
+#include "empathy-irc-server.h"
#include "test-helper.h"
-
-#include <libempathy/empathy-irc-server.h>
+#include "test-irc-helper.h"
static void
test_empathy_irc_server_new (void)
#include <stdio.h>
#include <string.h>
+#include "empathy-live-search.h"
#include "test-helper.h"
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-live-search.h>
+#include "empathy-debug.h"
typedef struct
{
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include "empathy-string-parser.h"
#include "test-helper.h"
-#include <telepathy-glib/telepathy-glib.h>
-
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-string-parser.h>
+#include "empathy-debug.h"
static void
test_replace_match (const gchar *text,
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <libempathy/empathy-tls-verifier.h>
-#include "test-helper.h"
-#include "mock-pkcs11.h"
-
-#include <gcr/gcr.h>
-
#include <gnutls/gnutls.h>
-
-#include <telepathy-glib/telepathy-glib.h>
#include <telepathy-glib/svc-tls.h>
-#include <telepathy-glib/svc-generic.h>
+
+#include "empathy-tls-verifier.h"
+#include "mock-pkcs11.h"
+#include "test-helper.h"
#define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate"
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/libempathy-gtk \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
$(WARN_CFLAGS) \
* Authors: Xavier Claessens <xclaesse@gmail.com>
*/
-#include <config.h>
+#include "config.h"
+
#include <stdlib.h>
#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-log-window.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
static void
destroy_cb (GtkWidget *dialog,
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-account-chooser.h>
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.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,
* Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
+#include "empathy-client-factory.h"
+#include "empathy-contact-blocking-dialog.h"
+#include "empathy-ui-utils.h"
static void
am_prepare_cb (GObject *source,
-#include <config.h>
+#include "config.h"
-#include <libempathy-gtk/empathy-roster-model.h>
-#include <libempathy-gtk/empathy-roster-model-manager.h>
-
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static void
individual_activated_cb (EmpathyRosterView *self,
* Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
-#include <libempathy/empathy-status-presets.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
+#include "empathy-presence-chooser.h"
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
int
main (int argc, char **argv)
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-protocol-chooser.h>
+#include "empathy-protocol-chooser.h"
+#include "empathy-ui-utils.h"
int
main (int argc,
-#include <config.h>
+#include "config.h"
-#include <libempathy-gtk/empathy-roster-model.h>
-#include <libempathy-gtk/empathy-roster-model-aggregator.h>
-
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-roster-model-aggregator.h"
+#include "empathy-roster-model.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 "config.h"
-#include <libempathy-gtk/empathy-roster-model.h>
-#include <libempathy-gtk/empathy-roster-model-manager.h>
-
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static gboolean show_offline = FALSE;
static gboolean show_groups = FALSE;
* Will Thompson <will.thompson@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
-#include <libempathy/empathy-status-presets.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-status-preset-dialog.h>
+#include "empathy-status-preset-dialog.h"
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
int
main (int argc, char **argv)
*/
#include "config.h"
-
#include "mock-pkcs11.h"
-#include <gcr/gcr.h>
-
-#include <glib.h>
-
#include <string.h>
/*
* 02111-1307, USA.
*/
-#include <glib.h>
-
-#include <gcr/gcr.h>
-
-#include <p11-kit/pkcs11.h>
#include <gck/pkcs11x.h>
+#include <gcr/gcr.h>
#ifndef MOCK_MODULE_H
#define MOCK_MODULE_H
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdlib.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#include "config.h"
#include "test-helper.h"
+#include "empathy-ui-utils.h"
+
void
test_init (int argc,
char **argv)
+#include "config.h"
#include "test-irc-helper.h"
void
-#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-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)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#ifndef __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
#define __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
#include <gtk/gtk.h>
-
#include <libaccounts-glib/ag-account.h>
G_BEGIN_DECLS
#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"
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#ifndef __EMPATHY_APP_PLUGIN_WIDGET_H__
#define __EMPATHY_APP_PLUGIN_WIDGET_H__
#include <gtk/gtk.h>
-
#include <libaccounts-glib/ag-account.h>
G_BEGIN_DECLS
#include "empathy-app-plugin.h"
-#include <libempathy/empathy-client-factory.h>
+#include "empathy-client-factory.h"
#include "empathy-app-plugin-widget.h"
#define __EMPATHY_APP_PLUGIN_H__
#include <glib-object.h>
-
#include <libaccount-plugin/application-plugin.h>
G_BEGIN_DECLS
#include "config.h"
+#include "empathy-webcredentials-monitor.h"
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
-
#include <libaccounts-glib/ag-account.h>
-#include "empathy-webcredentials-monitor.h"
-
G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_TYPE_OBJECT)
#define WEBCRED_BUS_NAME "com.canonical.indicators.webcredentials"
#define __EMPATHY_WEBCREDENTIALS_MONITOR_H__
#include <glib-object.h>
-
#include <libaccounts-glib/ag-manager.h>
G_BEGIN_DECLS
#include "mcp-account-manager-uoa.h"
#include <telepathy-glib/telepathy-glib.h>
-
#include <libaccounts-glib/ag-account.h>
#include <libaccounts-glib/ag-account-service.h>
#include <libaccounts-glib/ag-manager.h>
#include <libaccounts-glib/ag-service.h>
-
#include <string.h>
#include <ctype.h>
* Authors: Xavier Claessens <xavier.claessens@collabora.co.uk>
*/
+#include "config.h"
+
#include <mission-control-plugins/mission-control-plugins.h>
#include "mcp-account-manager-uoa.h"
projects / empathy.git / commitdiff