Use a flat namespace for internal includes

[empathy.git] / libempathy-gtk / empathy-ui-utils.h

diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index e690f11abfb8dc81923a23fb52c562002dbf7249..a7d86e0bb30a5b96cf6d8637a5cc25f78d9adeb1 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -36,11 +36,13 @@
 
 #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 () && \
@@ -57,6 +59,9 @@ void empathy_gtk_init (void);
 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,
@@ -86,16 +91,9 @@ GdkPixbuf * empathy_pixbuf_avatar_from_individual_scaled_finish (
     FolksIndividual *individual,
     GAsyncResult *result,
     GError **error);
-GdkPixbuf * empathy_pixbuf_from_avatar_scaled (EmpathyAvatar *avatar,
-    gint width,
-    gint height);
 GdkPixbuf * empathy_pixbuf_avatar_from_contact_scaled (EmpathyContact *contact,
     gint width,
     gint height);
-GdkPixbuf * empathy_pixbuf_protocol_from_contact_scaled (
-    EmpathyContact *contact,
-    gint width,
-    gint height);
 GdkPixbuf * empathy_pixbuf_contact_status_icon (EmpathyContact *contact,
     gboolean show_protocol);
 GdkPixbuf * empathy_pixbuf_contact_status_icon_with_icon_name (
@@ -111,18 +109,6 @@ GdkPixbuf * empathy_pixbuf_from_icon_name_sized (const gchar *icon_name,
 gchar * empathy_filename_from_icon_name (const gchar *icon_name,
     GtkIconSize icon_size);
 
-/* Text view */
-gboolean empathy_text_iter_forward_search (const GtkTextIter*iter,
-    const gchar *str,
-    GtkTextIter *match_start,
-    GtkTextIter *match_end,
-    const GtkTextIter*limit);
-gboolean empathy_text_iter_backward_search (const GtkTextIter*iter,
-    const gchar *str,
-    GtkTextIter *match_start,
-    GtkTextIter *match_end,
-    const GtkTextIter *limit);
-
 /* Windows */
 void empathy_window_present (GtkWindow *window);
 void empathy_window_present_with_time (GtkWindow *window,
@@ -166,6 +152,10 @@ void empathy_launch_program (const gchar *dir,
 
 void empathy_set_css_provider (GtkWidget *widget);
 
+gboolean empathy_launch_external_app (const gchar *desktop_file,
+    const gchar *args,
+    GError **error);
+
 G_END_DECLS
 
 #endif /*  __EMPATHY_UI_UTILS_H__ */