]> git.0d.be Git - empathy.git/commitdiff
remove empathy-chat-view
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 2 Jul 2012 13:52:33 +0000 (15:52 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 2 Jul 2012 13:56:39 +0000 (15:56 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=679255

libempathy-gtk/Makefile.am
libempathy-gtk/empathy-chat-view.c [deleted file]
libempathy-gtk/empathy-chat-view.h [deleted file]

index cb085543751d765125f3badff8ec34d26bf2c152..993a255691b2857f1cb228d85762cce01ab8ec97 100644 (file)
@@ -43,7 +43,6 @@ libempathy_gtk_handwritten_source =                   \
        empathy-cell-renderer-activatable.c     \
        empathy-cell-renderer-expander.c        \
        empathy-cell-renderer-text.c            \
-       empathy-chat-view.c                     \
        empathy-chat.c                          \
        empathy-contact-blocking-dialog.c       \
        empathy-contact-dialogs.c               \
@@ -110,7 +109,6 @@ libempathy_gtk_headers =                    \
        empathy-cell-renderer-activatable.h     \
        empathy-cell-renderer-expander.h        \
        empathy-cell-renderer-text.h            \
-       empathy-chat-view.h                     \
        empathy-chat.h                          \
        empathy-contact-blocking-dialog.h       \
        empathy-contact-dialogs.h               \
diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c
deleted file mode 100644 (file)
index 7d35efb..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include "config.h"
-
-#include "empathy-chat-view.h"
-#include "empathy-smiley-manager.h"
-
-static void chat_view_base_init (gpointer klass);
-
-GType
-empathy_chat_view_get_type (void)
-{
-       static GType type = 0;
-
-       if (!type) {
-               static const GTypeInfo type_info = {
-                       sizeof (EmpathyChatViewIface),
-                       chat_view_base_init,
-                       NULL,
-               };
-
-               type = g_type_register_static (G_TYPE_INTERFACE,
-                                              "EmpathyChatView",
-                                              &type_info, 0);
-
-               g_type_interface_add_prerequisite (type, GTK_TYPE_WIDGET);
-       }
-
-       return type;
-}
-
-static void
-chat_view_base_init (gpointer klass)
-{
-       static gboolean initialized = FALSE;
-
-       if (!initialized) {
-               initialized = TRUE;
-       }
-}
-
-void
-empathy_chat_view_append_message (EmpathyChatView *view,
-                                 EmpathyMessage  *msg,
-                                 gboolean         should_highlight)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_message) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_message (view,
-                                                                        msg,
-                                                                        should_highlight);
-       }
-}
-
-void
-empathy_chat_view_append_event (EmpathyChatView *view,
-                               const gchar    *str)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event (view,
-                                                                      str);
-       }
-}
-
-void
-empathy_chat_view_append_event_markup (EmpathyChatView *view,
-                                      const gchar     *markup_text,
-                                      const gchar     *fallback_text)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event_markup) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event_markup (view,
-                                                                             markup_text,
-                                                                             fallback_text);
-       } else {
-               empathy_chat_view_append_event (view, fallback_text);
-       }
-}
-
-void
-empathy_chat_view_edit_message (EmpathyChatView *view,
-                               EmpathyMessage  *message)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->edit_message) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->edit_message (
-                       view, message);
-       }
-}
-
-void
-empathy_chat_view_scroll (EmpathyChatView *view,
-                         gboolean        allow_scrolling)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->scroll) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->scroll (view,
-                                                                allow_scrolling);
-       }
-}
-
-void
-empathy_chat_view_scroll_down (EmpathyChatView *view)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->scroll_down) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->scroll_down (view);
-       }
-}
-
-gboolean
-empathy_chat_view_get_has_selection (EmpathyChatView *view)
-{
-       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), FALSE);
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->get_has_selection) {
-               return EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->get_has_selection (view);
-       }
-       return FALSE;
-}
-
-void
-empathy_chat_view_clear (EmpathyChatView *view)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->clear) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->clear (view);
-       }
-}
-
-gboolean
-empathy_chat_view_find_previous (EmpathyChatView *view,
-                                const gchar    *search_criteria,
-                                gboolean        new_search,
-                                gboolean        match_case)
-{
-       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), FALSE);
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->find_previous) {
-               return EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->find_previous (view,
-                                                                              search_criteria,
-                                                                              new_search,
-                                                                              match_case);
-       }
-       return FALSE;
-}
-
-gboolean
-empathy_chat_view_find_next (EmpathyChatView *view,
-                            const gchar    *search_criteria,
-                            gboolean        new_search,
-                            gboolean        match_case)
-{
-       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), FALSE);
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->find_next) {
-               return EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->find_next (view,
-                                                                          search_criteria,
-                                                                          new_search,
-                                                                          match_case);
-       }
-       return FALSE;
-}
-
-
-void
-empathy_chat_view_find_abilities (EmpathyChatView *view,
-                                 const gchar    *search_criteria,
-                                 gboolean        match_case,
-                                 gboolean       *can_do_previous,
-                                 gboolean       *can_do_next)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->find_abilities) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->find_abilities (view,
-                                                                        search_criteria,
-                                                                        match_case,
-                                                                        can_do_previous,
-                                                                        can_do_next);
-       }
-}
-
-void
-empathy_chat_view_highlight (EmpathyChatView *view,
-                            const gchar     *text,
-                            gboolean         match_case)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->highlight) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->highlight (view, text, match_case);
-       }
-}
-
-void
-empathy_chat_view_copy_clipboard (EmpathyChatView *view)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->copy_clipboard) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->copy_clipboard (view);
-       }
-}
-
-void
-empathy_chat_view_focus_toggled (EmpathyChatView *view,
-                                gboolean         has_focus)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->focus_toggled) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->focus_toggled (view, has_focus);
-       }
-}
-
-void
-empathy_chat_view_message_acknowledged (EmpathyChatView *view,
-                                       EmpathyMessage  *message)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->message_acknowledged) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->message_acknowledged (view, message);
-       }
-}
-
-/*
- * empathy_chat_view_set_show_avatars:
- * @view: a chat view
- * @show_avatars: TRUE if contacts' avatars should be shown alongside their name
- *
- * At present, this is only called on freshly-constructed chat views based on
- * whether or not the protocol supports avatars at all. Hence, themes don't
- * have to worry about retroactively showing or hiding avatars in the
- * scrollback.
- */
-void
-empathy_chat_view_set_show_avatars (EmpathyChatView *view,
-                                   gboolean show_avatars)
-{
-       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-       if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->set_show_avatars) {
-               EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->set_show_avatars (view, show_avatars);
-       }
-}
diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
deleted file mode 100644 (file)
index b263219..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#ifndef __EMPATHY_CHAT_VIEW_H__
-#define __EMPATHY_CHAT_VIEW_H__
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-message.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_CHAT_VIEW         (empathy_chat_view_get_type ())
-#define EMPATHY_CHAT_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CHAT_VIEW, EmpathyChatView))
-#define EMPATHY_IS_CHAT_VIEW(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CHAT_VIEW))
-#define EMPATHY_TYPE_CHAT_VIEW_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), EMPATHY_TYPE_CHAT_VIEW, EmpathyChatViewIface))
-
-typedef struct _EmpathyChatView      EmpathyChatView;
-typedef struct _EmpathyChatViewIface EmpathyChatViewIface;
-
-struct _EmpathyChatViewIface {
-       GTypeInterface   base_iface;
-
-       /* VTabled */
-       void             (*append_message)       (EmpathyChatView *view,
-                                                 EmpathyMessage  *msg,
-                                                 gboolean         should_highlight);
-       void             (*append_event)         (EmpathyChatView *view,
-                                                 const gchar     *str);
-       void             (*append_event_markup)  (EmpathyChatView *view,
-                                                 const gchar     *markup_text,
-                                                 const gchar     *fallback_text);
-       void             (*edit_message)         (EmpathyChatView *view,
-                                                 EmpathyMessage  *message);
-       void             (*scroll)               (EmpathyChatView *view,
-                                                 gboolean         allow_scrolling);
-       void             (*scroll_down)          (EmpathyChatView *view);
-       gboolean         (*get_has_selection)    (EmpathyChatView *view);
-       void             (*clear)                (EmpathyChatView *view);
-       gboolean         (*find_previous)        (EmpathyChatView *view,
-                                                 const gchar     *search_criteria,
-                                                 gboolean         new_search,
-                                                 gboolean         match_case);
-       gboolean         (*find_next)            (EmpathyChatView *view,
-                                                 const gchar     *search_criteria,
-                                                 gboolean         new_search,
-                                                 gboolean         match_case);
-       void             (*find_abilities)       (EmpathyChatView *view,
-                                                 const gchar     *search_criteria,
-                                                 gboolean         match_case,
-                                                 gboolean        *can_do_previous,
-                                                 gboolean        *can_do_next);
-       void             (*highlight)            (EmpathyChatView *view,
-                                                 const gchar     *text,
-                                                 gboolean         match_case);
-       void             (*copy_clipboard)       (EmpathyChatView *view);
-       void             (*focus_toggled)        (EmpathyChatView *view,
-                                                 gboolean         has_focus);
-       void             (*message_acknowledged) (EmpathyChatView *view,
-                                                 EmpathyMessage  *message);
-       void             (*set_show_avatars)     (EmpathyChatView *view,
-                                                 gboolean         show_avatars);
-};
-
-GType            empathy_chat_view_get_type             (void) G_GNUC_CONST;
-void             empathy_chat_view_append_message       (EmpathyChatView *view,
-                                                        EmpathyMessage  *msg,
-                                                        gboolean         should_highlight);
-void             empathy_chat_view_append_event         (EmpathyChatView *view,
-                                                        const gchar     *str);
-void             empathy_chat_view_append_event_markup  (EmpathyChatView *view,
-                                                        const gchar     *markup_text,
-                                                        const gchar     *fallback_text);
-void             empathy_chat_view_edit_message         (EmpathyChatView *view,
-                                                        EmpathyMessage  *message);
-void             empathy_chat_view_scroll               (EmpathyChatView *view,
-                                                        gboolean         allow_scrolling);
-void             empathy_chat_view_scroll_down          (EmpathyChatView *view);
-gboolean         empathy_chat_view_get_has_selection    (EmpathyChatView *view);
-void             empathy_chat_view_clear                (EmpathyChatView *view);
-gboolean         empathy_chat_view_find_previous        (EmpathyChatView *view,
-                                                        const gchar     *search_criteria,
-                                                        gboolean         new_search,
-                                                        gboolean         match_case);
-gboolean         empathy_chat_view_find_next            (EmpathyChatView *view,
-                                                        const gchar     *search_criteria,
-                                                        gboolean         new_search,
-                                                        gboolean         match_case);
-void             empathy_chat_view_find_abilities       (EmpathyChatView *view,
-                                                        const gchar     *search_criteria,
-                                                        gboolean         match_case,
-                                                        gboolean        *can_do_previous,
-                                                        gboolean        *can_do_next);
-void             empathy_chat_view_highlight            (EmpathyChatView *view,
-                                                        const gchar     *text,
-                                                        gboolean         match_case);
-void             empathy_chat_view_copy_clipboard       (EmpathyChatView *view);
-void             empathy_chat_view_focus_toggled        (EmpathyChatView *view,
-                                                        gboolean         has_focus);
-void             empathy_chat_view_message_acknowledged (EmpathyChatView *view,
-                                                        EmpathyMessage  *message);
-void             empathy_chat_view_set_show_avatars     (EmpathyChatView *view,
-                                                        gboolean         show_avatars);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CHAT_VIEW_H__ */
-