diff options
| -rw-r--r-- | libempathy-gtk/Makefile.am | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-main-window.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-presence-chooser.c | 2 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 3 | ||||
| -rw-r--r-- | libempathy/empathy-status-presets.c (renamed from libempathy-gtk/empathy-status-presets.c) | 5 | ||||
| -rw-r--r-- | libempathy/empathy-status-presets.dtd (renamed from libempathy-gtk/empathy-status-presets.dtd) | 0 | ||||
| -rw-r--r-- | libempathy/empathy-status-presets.h (renamed from libempathy-gtk/empathy-status-presets.h) | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 07336f55c..002762138 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -43,7 +43,6 @@ libempathy_gtk_la_SOURCES = \ empathy-private-chat.c \ empathy-group-chat.c \ empathy-geometry.c \ - empathy-status-presets.c \ empathy-presence-chooser.c \ empathy-about-dialog.c \ empathy-account-chooser.c \ @@ -99,7 +98,6 @@ libempathy_gtk_headers = \ empathy-private-chat.h \ empathy-group-chat.h \ empathy-geometry.h \ - empathy-status-presets.h \ empathy-presence-chooser.h \ empathy-about-dialog.h \ empathy-account-chooser.h \ @@ -178,7 +176,6 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers) dtddir = $(datadir)/empathy dtd_DATA = \ - empathy-status-presets.dtd \ empathy-contact-groups.dtd pkgconfigdir = $(libdir)/pkgconfig diff --git a/libempathy-gtk/empathy-main-window.c b/libempathy-gtk/empathy-main-window.c index d0353419a..7970cb1f9 100644 --- a/libempathy-gtk/empathy-main-window.c +++ b/libempathy-gtk/empathy-main-window.c @@ -37,6 +37,7 @@ #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-contact-factory.h> +#include <libempathy/empathy-status-presets.h> #include "empathy-main-window.h" #include "empathy-contact-dialogs.h" @@ -45,7 +46,6 @@ #include "empathy-contact-list-view.h" #include "empathy-presence-chooser.h" #include "empathy-ui-utils.h" -#include "empathy-status-presets.h" #include "empathy-geometry.h" #include "empathy-preferences.h" #include "empathy-accounts-dialog.h" diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index 17a627389..c64962afa 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -38,11 +38,11 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-debug.h> #include <libempathy/empathy-marshal.h> +#include <libempathy/empathy-status-presets.h> #include "empathy-ui-utils.h" #include "empathy-images.h" #include "empathy-presence-chooser.h" -#include "empathy-status-presets.h" #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv)) diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 733289f51..c6c7faa8e 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -20,6 +20,7 @@ libempathy_la_SOURCES = \ empathy-avatar.c \ empathy-time.c \ empathy-presence.c \ + empathy-status-presets.c \ empathy-debug.c \ empathy-utils.c \ empathy-message.c \ @@ -56,6 +57,7 @@ libempathy_headers = \ empathy-avatar.h \ empathy-time.h \ empathy-presence.h \ + empathy-status-presets.h \ empathy-debug.h \ empathy-utils.h \ empathy-message.h \ @@ -139,6 +141,7 @@ empathy-enum-types.c: $(libempathy_headers) Makefile dtddir = $(datadir)/empathy dtd_DATA = \ + empathy-status-presets.dtd \ empathy-chatroom-manager.dtd stylesheetdir = $(datadir)/empathy diff --git a/libempathy-gtk/empathy-status-presets.c b/libempathy/empathy-status-presets.c index 13b71bc75..54f7b629c 100644 --- a/libempathy-gtk/empathy-status-presets.c +++ b/libempathy/empathy-status-presets.c @@ -34,9 +34,8 @@ #include <telepathy-glib/util.h> -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> - +#include "empathy-debug.h" +#include "empathy-utils.h" #include "empathy-status-presets.h" #define DEBUG_DOMAIN "StatusPresets" diff --git a/libempathy-gtk/empathy-status-presets.dtd b/libempathy/empathy-status-presets.dtd index 872be6b4e..872be6b4e 100644 --- a/libempathy-gtk/empathy-status-presets.dtd +++ b/libempathy/empathy-status-presets.dtd diff --git a/libempathy-gtk/empathy-status-presets.h b/libempathy/empathy-status-presets.h index 8a4564f00..68f3cea56 100644 --- a/libempathy-gtk/empathy-status-presets.h +++ b/libempathy/empathy-status-presets.h @@ -23,7 +23,7 @@ #ifndef __EMPATHY_STATUS_PRESETS_H__ #define __EMPATHY_STATUS_PRESETS_H__ -#include <libempathy/empathy-presence.h> +#include "empathy-presence.h" G_BEGIN_DECLS |