diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-07-01 05:12:20 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-07-01 05:12:20 +0800 |
| commit | 93121986d945e05416885c8eca30a65346018618 (patch) | |
| tree | 569b475dff544ef4e2b6f75ac86dc196f600167a /src | |
| parent | 06c61065618fd96c1d18fc20690fed634ce536b0 (diff) | |
| download | gsoc2013-empathy-93121986d945e05416885c8eca30a65346018618.tar gsoc2013-empathy-93121986d945e05416885c8eca30a65346018618.tar.gz gsoc2013-empathy-93121986d945e05416885c8eca30a65346018618.tar.bz2 gsoc2013-empathy-93121986d945e05416885c8eca30a65346018618.tar.lz gsoc2013-empathy-93121986d945e05416885c8eca30a65346018618.tar.xz gsoc2013-empathy-93121986d945e05416885c8eca30a65346018618.tar.zst gsoc2013-empathy-93121986d945e05416885c8eca30a65346018618.zip | |
2007-06-30 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-account-widget-generic.c: Fix a leaked ref.
* src/empathy.c: If we get a chatroom we have to create an
EmpathyTpChatroom object.
* src/Makefile.am: Fix build system, programs links to libempathy-gtk
and libempathy.
* configure.ac: libempathy does not depends on libgnome-vfs.
* libempathy-gtk/empathy-status-icon.c:
* libempathy-gtk/empathy-chat.c:
* libempathy/empathy-tp-chat.c:
* libempathy/empathy-tp-chat.h:
* libempathy/empathy-filter.c:
* libempathy/empathy-filter.h:
* libempathy/empathy-filter.xml:
* libempathy/Makefile.am: Filter incoming text channels and make
status icon flash when there we receive a new message. Dispatch the
channel only when we get a message and the user click on the icon.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@175 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/empathy.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b89a4218d..c7344c8c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,9 @@ AM_CPPFLAGS = \ $(EMPATHY_CFLAGS) \ $(WARN_CFLAGS) -LDADD = \ +LDADD = \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ + $(top_builddir)/libempathy/libempathy.la \ $(EMPATHY_LIBS) bin_PROGRAMS = \ diff --git a/src/empathy.c b/src/empathy.c index 6ca47192d..416d2134d 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -43,6 +43,7 @@ #include <libempathy/empathy-contact.h> #include <libempathy/empathy-chandler.h> #include <libempathy/empathy-tp-chat.h> +#include <libempathy/empathy-tp-chatroom.h> #include <libempathy/empathy-idle.h> #include <libempathy-gtk/empathy-main-window.h> #include <libempathy-gtk/empathy-status-icon.h> @@ -117,7 +118,11 @@ new_channel_cb (EmpathyChandler *chandler, EmpathyTpChat *tp_chat; /* The chat died, give him the new text channel */ - tp_chat = empathy_tp_chat_new (account, tp_chan); + if (empathy_chat_is_group_chat (chat)) { + tp_chat = EMPATHY_TP_CHAT (empathy_tp_chatroom_new (account, tp_chan)); + } else { + tp_chat = empathy_tp_chat_new (account, tp_chan); + } empathy_chat_set_tp_chat (chat, tp_chat); g_object_unref (tp_chat); } |