Merge branch 'ft_rework'

[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 6a52ff111b6ffe31f179d0b4e14db5652eeadf80..4d58fedcf7d3f52ba7bafbf2b716d1b87a264b49 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -15,15 +15,15 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- * 
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
  * Authors: Mikael Hallendal <micke@imendio.com>
  *          Richard Hult <richard@imendio.com>
  *          Martyn Russell <martyn@imendio.com>
  *          Xavier Claessens <xclaesse@gmail.com>
  *          Jonny Lamb <jonny.lamb@collabora.co.uk>
- * 
+ *
  *          Part of this file is copied from GtkSourceView (gtksourceiter.c):
  *          Paolo Maggi
  *          Jeroen Zwartepoorte
@@ -33,12 +33,14 @@
 #define __EMPATHY_UI_UTILS_H__
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
+
+#include <canberra-gtk.h>
 
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-profile.h>
 
 #include <libempathy/empathy-contact.h>
+#include <libempathy/empathy-ft-handler.h>
 
 #include "empathy-chat-view.h"
 
@@ -46,7 +48,7 @@ G_BEGIN_DECLS
 
 /* NOTE: Keep this sync with sound_entries in empathy-ui-utils.c */
 typedef enum {
-       EMPATHY_SOUND_MESSAGE_INCOMING,
+       EMPATHY_SOUND_MESSAGE_INCOMING = 0,
        EMPATHY_SOUND_MESSAGE_OUTGOING,
        EMPATHY_SOUND_CONVERSATION_NEW,
        EMPATHY_SOUND_CONTACT_CONNECTED,
@@ -56,32 +58,26 @@ typedef enum {
        EMPATHY_SOUND_PHONE_INCOMING,
        EMPATHY_SOUND_PHONE_OUTGOING,
        EMPATHY_SOUND_PHONE_HANGUP,
-       LAST_EMPATHY_SOUND
+       LAST_EMPATHY_SOUND,
 } EmpathySound;
 
 void            empathy_gtk_init                        (void);
+GRegex *        empathy_uri_regex_dup_singleton         (void);
+
 /* Glade */
-void            empathy_glade_get_file_simple           (const gchar      *filename,
-                                                        const gchar      *root,
-                                                        const gchar      *domain,
-                                                        const gchar      *first_required_widget,
+GtkBuilder *    empathy_builder_get_file                (const gchar      *filename,
+                                                        const gchar      *first_object,
                                                         ...);
-GladeXML *      empathy_glade_get_file                  (const gchar      *filename,
-                                                        const gchar      *root,
-                                                        const gchar      *domain,
-                                                        const gchar      *first_required_widget,
-                                                        ...);
-void            empathy_glade_connect                   (GladeXML         *gui,
+void            empathy_builder_connect                 (GtkBuilder       *gui,
                                                         gpointer          user_data,
-                                                        gchar            *first_widget,
-                                                        ...);
-void            empathy_glade_setup_size_group          (GladeXML         *gui,
-                                                        GtkSizeGroupMode  mode,
-                                                        gchar            *first_widget,
+                                                        gchar            *first_object,
                                                         ...);
+GtkWidget     *empathy_builder_unref_and_keep_widget    (GtkBuilder       *gui,
+                                                        GtkWidget        *root);
+
 /* Pixbufs */
 const gchar * empathy_icon_name_from_account            (McAccount        *account);
-const gchar * empathy_icon_name_for_presence            (McPresence        presence);
+const gchar * empathy_icon_name_for_presence            (TpConnectionPresenceType  presence);
 const gchar * empathy_icon_name_for_contact             (EmpathyContact   *contact);
 GdkPixbuf *   empathy_pixbuf_from_data                  (gchar            *data,
                                                         gsize             data_size);
@@ -128,13 +124,16 @@ GtkWidget * empathy_link_button_new                     (const gchar      *url,
                                                         const gchar      *title);
 
 void        empathy_send_file_with_file_chooser         (EmpathyContact   *contact);
+void        empathy_receive_file_with_file_chooser      (EmpathyFTHandler *handler);
 
 /* Sounds */
 void        empathy_sound_play                          (GtkWidget        *widget,
                                                         EmpathySound      sound_id);
-
-/* Notifications */
-gboolean    empathy_notification_should_show            (gboolean          check_focus);
+gboolean    empathy_sound_play_full                     (GtkWidget *widget,
+                                                        EmpathySound sound_id,
+                                                        ca_finish_callback_t callback,
+                                                        gpointer user_data);
+void        empathy_sound_stop                          (EmpathySound sound_id);
 
 G_END_DECLS