--- empathy-2.27.3.orig/debian/rules +++ empathy-2.27.3/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +DEB_DH_INSTALL_SOURCEDIR=debian/tmp + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk + +# List any files which are not installed +include /usr/share/cdbs/1/rules/utils.mk +common-binary-post-install-arch:: list-missing + +# Ensure at build time that the library has no dependencies on undefined +# symbols, and speed up loading. +#LDFLAGS += -Wl,-z,defs -Wl,-O1 + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \ + --enable-python \ + --enable-megaphone \ + --disable-tests \ + --enable-libindicate + +binary-install/python-empathy:: + dh_pysupport -p$(cdbs_curpkg) + +include $(CURDIR)/debian/update-patches.mk --- empathy-2.27.3.orig/debian/empathy-logs.1 +++ empathy-2.27.3/debian/empathy-logs.1 @@ -0,0 +1,12 @@ +.TH EMPATHY-LOGS "1" "February 2009" "Telepathy project" "User Commands" +.SH NAME +empathy\-logs \- view Telepathy instant messaging logs +.SH SYNOPSIS +empathy\-logs +.SH DESCRIPTION +empathy-logs displays a graphical (Gtk+) dialog where the instant messaging +logs used by Emapthy can be read and searched. +.SH OPTIONS +There are no command-line options. +.SH SEE ALSO +\fIhttp://telepathy.freedesktop.org/\fR, \fIhttp://live.gnome.org/Empathy\fR --- empathy-2.27.3.orig/debian/gbp.conf +++ empathy-2.27.3/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +debian-branch = debian +upstream-branch = upstream +pristine-tar = True + +[git-buildpackage] +tarball-dir = ../tarballs/ +export-dir = ../build-area/ --- empathy-2.27.3.orig/debian/update-patches.mk +++ empathy-2.27.3/debian/update-patches.mk @@ -0,0 +1,10 @@ +update-patches: + mkdir -p $(CURDIR)/debian/patches + rm -f $(CURDIR)/debian/patches/*.patch + git-format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream + for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \ + do \ + lines=$$(cat $$patch | wc -l) ; \ + head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \ + mv $${patch}.chomped $$patch ; \ + done --- empathy-2.27.3.orig/debian/libempathy-gtk24.symbols +++ empathy-2.27.3/debian/libempathy-gtk24.symbols @@ -0,0 +1,220 @@ +libempathy-gtk.so.24 libempathy-gtk24 #MINVER# + empathy_account_chooser_dup_account@Base 2.27.1.1 + empathy_account_chooser_filter_is_connected@Base 0.21.91 + empathy_account_chooser_get_connection@Base 2.27.1.1 + empathy_account_chooser_get_has_all_option@Base 0.21.91 + empathy_account_chooser_get_type@Base 0.21.91 + empathy_account_chooser_new@Base 0.21.91 + empathy_account_chooser_set_account@Base 0.21.91 + empathy_account_chooser_set_filter@Base 0.21.91 + empathy_account_chooser_set_has_all_option@Base 0.21.91 + empathy_account_widget_add_forget_button@Base 0.21.91 + empathy_account_widget_aim_new@Base 0.23.1 + empathy_account_widget_generic_new@Base 0.21.91 + empathy_account_widget_groupwise_new@Base 0.23.1 + empathy_account_widget_handle_params@Base 0.21.91 + empathy_account_widget_icq_new@Base 0.21.91 + empathy_account_widget_irc_new@Base 0.21.91 + empathy_account_widget_jabber_new@Base 0.21.91 + empathy_account_widget_msn_new@Base 0.21.91 + empathy_account_widget_salut_new@Base 0.21.91 + empathy_account_widget_set_default_focus@Base 2.27.3 + empathy_account_widget_sip_new@Base 0.22.1 + empathy_account_widget_yahoo_new@Base 0.21.91 + empathy_audio_sink_get_type@Base 2.25.91 + empathy_audio_sink_get_volume@Base 2.25.91 + empathy_audio_sink_new@Base 2.25.91 + empathy_audio_sink_set_volume@Base 2.25.91 + empathy_audio_src_get_type@Base 2.25.91 + empathy_audio_src_get_volume@Base 2.25.92 + empathy_audio_src_new@Base 2.25.91 + empathy_audio_src_set_volume@Base 2.25.92 + empathy_avatar_chooser_get_image_data@Base 0.21.91 + empathy_avatar_chooser_get_type@Base 0.21.91 + empathy_avatar_chooser_new@Base 0.21.91 + empathy_avatar_chooser_set@Base 0.21.91 + empathy_avatar_image_get_type@Base 0.21.91 + empathy_avatar_image_new@Base 0.21.91 + empathy_avatar_image_set@Base 0.21.91 + empathy_builder_connect@Base 2.27.1.1 + empathy_builder_get_file@Base 2.27.1.1 + empathy_builder_unref_and_keep_widget@Base 2.27.1.1 + empathy_cell_renderer_activatable_get_type@Base 0.21.91 + empathy_cell_renderer_activatable_new@Base 0.21.91 + empathy_cell_renderer_expander_get_type@Base 0.21.91 + empathy_cell_renderer_expander_new@Base 0.21.91 + empathy_cell_renderer_text_get_type@Base 0.21.91 + empathy_cell_renderer_text_new@Base 0.21.91 + empathy_chat_clear@Base 0.21.91 + empathy_chat_copy@Base 0.21.91 + empathy_chat_correct_word@Base 0.21.91 + empathy_chat_cut@Base 0.21.91 + empathy_chat_get_account@Base 0.21.91 + empathy_chat_get_contact_menu@Base 0.23.2 + empathy_chat_get_id@Base 0.21.91 + empathy_chat_get_name@Base 0.21.91 + empathy_chat_get_remote_contact@Base 0.23.1 + empathy_chat_get_subject@Base 0.23.1 + empathy_chat_get_tp_chat@Base 0.23.1 + empathy_chat_get_type@Base 0.21.91 + empathy_chat_is_room@Base 2.23.91 + empathy_chat_new@Base 0.23.1 + empathy_chat_paste@Base 0.21.91 + empathy_chat_scroll_down@Base 0.21.91 + empathy_chat_set_tp_chat@Base 0.21.91 + empathy_chat_text_view_append_body@Base 2.25.3 + empathy_chat_text_view_append_spacing@Base 2.25.3 + empathy_chat_text_view_get_last_contact@Base 2.25.3 + empathy_chat_text_view_get_type@Base 2.25.3 + empathy_chat_text_view_set_only_if_date@Base 2.25.3 + empathy_chat_text_view_tag_set@Base 2.25.3 + empathy_chat_view_append_event@Base 0.21.91 + empathy_chat_view_append_message@Base 0.21.91 + empathy_chat_view_clear@Base 0.21.91 + empathy_chat_view_copy_clipboard@Base 0.21.91 + empathy_chat_view_find_abilities@Base 0.21.91 + empathy_chat_view_find_next@Base 0.21.91 + empathy_chat_view_find_previous@Base 0.21.91 + empathy_chat_view_get_has_selection@Base 2.25.3 + empathy_chat_view_get_type@Base 0.21.91 + empathy_chat_view_highlight@Base 0.21.91 + empathy_chat_view_scroll@Base 0.21.91 + empathy_chat_view_scroll_down@Base 0.21.91 + empathy_conf_get@Base 0.21.91 + empathy_conf_get_bool@Base 0.21.91 + empathy_conf_get_int@Base 0.21.91 + empathy_conf_get_string@Base 0.21.91 + empathy_conf_get_string_list@Base 0.21.91 + empathy_conf_get_type@Base 0.21.91 + empathy_conf_notify_add@Base 0.21.91 + empathy_conf_notify_remove@Base 0.21.91 + empathy_conf_set_bool@Base 0.21.91 + empathy_conf_set_int@Base 0.21.91 + empathy_conf_set_string@Base 0.21.91 + empathy_conf_set_string_list@Base 0.21.91 + empathy_conf_shutdown@Base 0.21.91 + empathy_contact_audio_call_menu_item_new@Base 2.27.1.1 + empathy_contact_chat_menu_item_new@Base 0.23.2 + empathy_contact_edit_dialog_show@Base 2.27.1.1 + empathy_contact_edit_menu_item_new@Base 0.23.2 + empathy_contact_feature_flags_get_type@Base 0.23.2 + empathy_contact_file_transfer_menu_item_new@Base 2.25.2 + empathy_contact_info_menu_item_new@Base 0.23.2 + empathy_contact_information_dialog_show@Base 0.21.91 + empathy_contact_invite_menu_item_new@Base 2.25.2 + empathy_contact_list_feature_flags_get_type@Base 0.23.2 + empathy_contact_list_store_col_get_type@Base 0.21.91 + empathy_contact_list_store_get_is_compact@Base 0.21.91 + empathy_contact_list_store_get_list_iface@Base 0.21.91 + empathy_contact_list_store_get_parent_group@Base 0.21.91 + empathy_contact_list_store_get_show_avatars@Base 0.21.91 + empathy_contact_list_store_get_show_groups@Base 0.21.91 + empathy_contact_list_store_get_show_offline@Base 0.21.91 + empathy_contact_list_store_get_sort_criterium@Base 0.21.91 + empathy_contact_list_store_get_type@Base 0.21.91 + empathy_contact_list_store_new@Base 0.21.91 + empathy_contact_list_store_row_separator_func@Base 0.21.91 + empathy_contact_list_store_search_equal_func@Base 0.21.91 + empathy_contact_list_store_set_is_compact@Base 0.21.91 + empathy_contact_list_store_set_show_avatars@Base 0.21.91 + empathy_contact_list_store_set_show_groups@Base 0.21.91 + empathy_contact_list_store_set_show_offline@Base 0.21.91 + empathy_contact_list_store_set_sort_criterium@Base 0.21.91 + empathy_contact_list_store_sort_get_type@Base 0.21.91 + empathy_contact_list_view_dup_selected@Base 2.27.1.1 + empathy_contact_list_view_get_contact_menu@Base 0.21.91 + empathy_contact_list_view_get_group_menu@Base 0.21.91 + empathy_contact_list_view_get_selected_group@Base 0.21.91 + empathy_contact_list_view_get_type@Base 0.21.91 + empathy_contact_list_view_new@Base 0.21.91 + empathy_contact_log_menu_item_new@Base 0.23.2 + empathy_contact_menu_new@Base 0.23.2 + empathy_contact_personal_dialog_show@Base 2.27.1.1 + empathy_contact_selector_dup_selected@Base 2.25.91 + empathy_contact_selector_get_type@Base 2.25.91 + empathy_contact_selector_new@Base 2.25.91 + empathy_contact_selector_set_visible@Base 2.27.1.1 + empathy_contact_video_call_menu_item_new@Base 2.27.1.1 + empathy_contact_widget_flags_get_type@Base 0.21.91 + empathy_contact_widget_get_contact@Base 0.21.91 + empathy_contact_widget_new@Base 0.21.91 + empathy_contact_widget_set_account_filter@Base 0.21.91 + empathy_contact_widget_set_contact@Base 0.21.91 + empathy_filename_from_icon_name@Base 2.27.3 + empathy_geometry_load@Base 0.21.91 + empathy_geometry_save@Base 0.21.91 + empathy_get_toplevel_window@Base 0.21.91 + empathy_gst_video_src_channel_get_type@Base 2.25.92 + empathy_gtk_init@Base 2.25.3 + empathy_icon_name_for_contact@Base 0.21.91 + empathy_icon_name_for_presence@Base 0.21.91 + empathy_icon_name_from_account@Base 0.21.91 + empathy_irc_network_dialog_show@Base 0.21.91 + empathy_link_button_new@Base 0.21.91 + empathy_log_window_show@Base 0.21.91 + empathy_new_contact_dialog_show@Base 0.21.91 + empathy_new_message_dialog_show@Base 0.21.91 + empathy_pixbuf_avatar_from_contact_scaled@Base 0.21.91 + empathy_pixbuf_from_avatar_scaled@Base 0.21.91 + empathy_pixbuf_from_data@Base 0.21.91 + empathy_pixbuf_from_data_and_mime@Base 2.25.2 + empathy_pixbuf_from_icon_name@Base 0.21.91 + empathy_pixbuf_from_icon_name_sized@Base 2.25.91 + empathy_pixbuf_scale_down_if_necessary@Base 0.21.91 + empathy_presence_chooser_create_menu@Base 0.21.91 + empathy_presence_chooser_get_type@Base 0.21.91 + empathy_presence_chooser_new@Base 0.21.91 + empathy_profile_chooser_dup_selected@Base 2.27.1.1 + empathy_profile_chooser_get_type@Base 2.27.3 + empathy_profile_chooser_n_profiles@Base 0.21.91 + empathy_profile_chooser_new@Base 0.21.91 + empathy_receive_file_with_file_chooser@Base 2.27.3 + empathy_send_file_with_file_chooser@Base 2.25.2 + empathy_smiley_free@Base 0.21.91 + empathy_smiley_manager_add@Base 0.21.91 + empathy_smiley_manager_dup_singleton@Base 2.25.91 + empathy_smiley_manager_get_all@Base 0.21.91 + empathy_smiley_manager_get_type@Base 0.21.91 + empathy_smiley_manager_load@Base 0.21.91 + empathy_smiley_manager_parse@Base 0.21.91 + empathy_smiley_menu_new@Base 2.25.3 + empathy_sound_get_type@Base 2.25.4 + empathy_sound_play@Base 2.25.4 + empathy_sound_play_full@Base 2.25.91 + empathy_sound_stop@Base 2.25.91 + empathy_spell_check@Base 0.21.91 + empathy_spell_free_language_codes@Base 0.21.91 + empathy_spell_free_suggestions@Base 0.21.91 + empathy_spell_get_language_codes@Base 0.21.91 + empathy_spell_get_language_name@Base 0.21.91 + empathy_spell_get_suggestions@Base 0.21.91 + empathy_spell_supported@Base 0.21.91 + empathy_status_preset_dialog_get_type@Base 2.27.1.1 + empathy_status_preset_dialog_new@Base 2.27.1.1 + empathy_subscription_dialog_show@Base 0.21.91 + empathy_text_iter_backward_search@Base 0.21.91 + empathy_text_iter_forward_search@Base 0.21.91 + empathy_theme_boxes_get_type@Base 0.21.91 + empathy_theme_boxes_new@Base 2.25.3 + empathy_theme_irc_get_type@Base 0.21.91 + empathy_theme_irc_new@Base 2.25.3 + empathy_theme_manager_create_view@Base 2.25.3 + empathy_theme_manager_get@Base 0.21.91 + empathy_theme_manager_get_themes@Base 0.21.91 + empathy_theme_manager_get_type@Base 0.21.91 + empathy_toggle_button_set_state_quietly@Base 0.21.91 + empathy_uri_regex_dup_singleton@Base 2.25.92 + empathy_url_show@Base 0.21.91 + empathy_video_src_get_channel@Base 2.25.92 + empathy_video_src_get_supported_channels@Base 2.25.92 + empathy_video_src_get_type@Base 2.25.91 + empathy_video_src_new@Base 2.25.91 + empathy_video_src_set_channel@Base 2.25.92 + empathy_video_widget_get_element@Base 2.25.91 + empathy_video_widget_get_sink@Base 2.25.91 + empathy_video_widget_get_type@Base 2.25.91 + empathy_video_widget_new@Base 2.25.91 + empathy_video_widget_new_with_size@Base 2.25.91 + empathy_window_get_is_visible@Base 0.21.91 + empathy_window_iconify@Base 0.21.91 + empathy_window_present@Base 0.21.91 --- empathy-2.27.3.orig/debian/pyversion +++ empathy-2.27.3/debian/pyversion @@ -0,0 +1 @@ +2.4- --- empathy-2.27.3.orig/debian/changelog +++ empathy-2.27.3/debian/changelog @@ -0,0 +1,806 @@ +empathy (2.27.3-1ubuntu1) karmic; urgency=low + + * Merge from debian experimental, remaining changes: (LP: #388590) + - Add Suggests on telepathy-idle + - Bump telepathy-butterfly and telepathy-haze to recommends + * debian/patches/001_add_indicator.patch: + - Add libindicate support (LP: #340180) + * debian/patches/099_autoreconf.patch: Run autoreconf + + -- Laurent Bigonville Tue, 23 Jun 2009 11:43:15 +0200 + +empathy (2.27.3-1) experimental; urgency=low + + * New upstream release. + - Bump libraries soname and adjust .symbols files + * debian/control: Bump libtelepathy-glib-dev build-dep + * debian/libempathy-gtk-common.install: Add default adium theme + + -- Laurent Bigonville Wed, 17 Jun 2009 20:38:21 +0200 + +empathy (2.27.2-1ubuntu1) karmic; urgency=low + + * Merge from debian experimental, remaining changes: + - Add Suggests on telepathy-idle + - Bump telepathy-butterfly and telepathy-haze to recommends + + -- Laurent Bigonville Sun, 31 May 2009 19:05:28 +0200 + +empathy (2.27.2-1) experimental; urgency=low + + * New upstream release + - Bump libraries soname and adjust .symbols files + + -- Laurent Bigonville Sun, 31 May 2009 16:52:39 +0200 + +empathy (2.27.1.1-1ubuntu1) karmic; urgency=low + + * Merge from debian experimental, remaining changes: + - Add Suggests on telepathy-idle + * Bump telepathy-butterfly and telepathy-haze to recommends + + -- Laurent Bigonville Wed, 20 May 2009 09:52:57 +0200 + +empathy (2.27.1.1-1) experimental; urgency=low + + * New upstream release + - Bump libraries soname and adjust .symbols files + * debian/control: + - Bump libgtk2.0-dev and libtelepathy-glib-dev build-dep + - Bump libgtk2.0-dev dependency for libempathy-gtk-dev + - Remove all libglade references + * debian/libempathy-gtk-common.install: now install .ui files instead + of .glade files + * Bump debhelper version to 7 + + -- Laurent Bigonville Tue, 19 May 2009 14:18:13 +0200 + +empathy (2.26.2-1) unstable; urgency=low + + [ Jonny Lamb ] + * debian/control: Added haze and butterfly as empathy Suggests. + + [ Laurent Bigonville ] + * New upstream release + + -- Laurent Bigonville Mon, 18 May 2009 21:43:25 +0200 + +empathy (2.26.1-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + + -- Laurent Bigonville Tue, 14 Apr 2009 12:03:23 +0200 + +empathy (2.26.1-1) unstable; urgency=low + + * New upstream release + * debian/control: Add Homepage field + + -- Laurent Bigonville Tue, 14 Apr 2009 11:44:14 +0200 + +empathy (2.26.0.1-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #351884) + + -- Laurent Bigonville Wed, 01 Apr 2009 20:22:40 +0200 + +empathy (2.26.0-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + + -- Laurent Bigonville Wed, 18 Mar 2009 13:43:01 +0100 + +empathy (2.26.0-1) unstable; urgency=low + + * New Upstream Version + - Bump libtelepathy-glib-dev build-dependency + - Bump libempathy soname and adjust .symbols file + * debian/control: + - Bump Standards-Version to 3.8.1 (no further changes) + - Remove telepathy-stream-engine recommends and conflicts + * python-empathy.install: Fix FTBFS with python >= 2.6 + + -- Laurent Bigonville Wed, 18 Mar 2009 13:18:54 +0100 + +empathy (2.25.92-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + * Fix FTBFS with python >= 2.6 + + -- Laurent Bigonville Wed, 11 Mar 2009 01:28:38 +0100 + +empathy (2.25.92-1) unstable; urgency=low + + * New Upstream Version + * Bump libempathy soname again + + -- Sjoerd Simons Tue, 03 Mar 2009 23:46:29 +0000 + +empathy (2.25.91-2) unstable; urgency=low + + [ Laurent Bigonville ] + * debian/control: Add minimal version for libtelepathy-farsight-dev build-dep + + [ Jonny Lamb ] + * Upload to unstable. + + -- Jonny Lamb Tue, 03 Mar 2009 18:05:50 +0000 + +empathy (2.25.91-1) experimental; urgency=low + + [ Sjoerd Simons ] + * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch + - Removed, fixed upstream + + [ Jonny Lamb ] + * New upstream release. + + Bumped libempathy{,-gtk} sonames. + * debian/gbp.conf: Removed no-create-orig field. + * debian/control: + + Added myself to Uploaders. + + Removed XS-Dm-Upload-Allowed field. + + Upped build-dep on libtelepathy-glib-dev to >= 0.7.21. + + Removed duplicate Section fields. + + Made short descriptions unique. + * debian/libempathy21.symbols: Updated symbols file. + * debian/libempathy-gtk19.symbols: Updated symbols file. + * debian/empathy-logs.1: Added new manpage. + * debian/copyright: Completely rewrote. + + -- Jonny Lamb Fri, 27 Feb 2009 15:20:03 +0000 + +empathy (2.25.4-1ubuntu1) jaunty; urgency=low + + * Merge from debian experimental, remaining changes: + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + * Drop debian/patches/01fixtabbehavour.diff: Upstream is not happy + with this patch. + + -- Laurent Bigonville Sun, 18 Jan 2009 14:31:56 +0100 + +empathy (2.25.4-1) experimental; urgency=low + + [ Simon McVittie ] + * Switch packaging to git + * Add gbp.conf (for git-buildpackage) and `debian/rules update-patches` + target + * Add README.source + + [ Sjoerd Simons ] + * New Upstream Version + * debian/control: Add libcanberra-gtk-dev to build-depends + * debian/control: Bump libempathy soname from 17 to 19 + * debian/libempathy-gtk17.symbols: Update with new symbols + * debian/libempathy19.symbols: Update with new symbols + * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch + - Added. Set the initial values of the sound preferences from the + configuration. (From upstream git) + + -- Sjoerd Simons Wed, 07 Jan 2009 18:33:49 +0000 + +empathy (2.25.3-1) experimental; urgency=low + + * New upstream release + - Bump libempathy-gtk soname + - Fix symbols files + * debian/control: + - Bump libgtk2.0-dev build-dependency + - Drop libgnomeui-dev build-dep + * Drop debian/patches/64bit-build-fix.patch: fixed upstream + + -- Laurent Bigonville Sat, 20 Dec 2008 21:45:15 +0100 + +empathy (2.25.2-2ubuntu1) jaunty; urgency=low + + * Merge from debian experimental, remaining changes: + - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat + dialogs + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + + -- Laurent Bigonville Thu, 04 Dec 2008 15:31:52 +0100 + +empathy (2.25.2-2) experimental; urgency=low + + * debian/patches/64bit-build-fix.patch: + - Fix build on 64 bit platforms + + -- Sjoerd Simons Thu, 04 Dec 2008 00:46:53 +0000 + +empathy (2.25.2-1ubuntu1) jaunty; urgency=low + + * Merge from debian experimental, remaining changes: + - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat + dialogs + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + + -- Laurent Bigonville Mon, 01 Dec 2008 22:20:36 +0100 + +empathy (2.25.2-1) experimental; urgency=low + + * New upstream release. + - Bump libtelepathy-glib-dev build-dep and add libgnomeui-dev + - Bump soname of libempathy + + -- Laurent Bigonville Mon, 01 Dec 2008 21:35:56 +0100 + +empathy (2.24.1-1ubuntu1) intrepid; urgency=low + + * Merge from debian experimental, remaining changes: + - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat + dialogs + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + + -- Laurent Bigonville Mon, 20 Oct 2008 21:48:50 +0200 + +empathy (2.24.1-1) experimental; urgency=low + + * New upstream release. + + -- Laurent Bigonville Mon, 20 Oct 2008 21:12:27 +0200 + +empathy (2.24.0-1ubuntu1) intrepid; urgency=low + + * Merge from debian experimental, remaining changes: + - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat + dialogs + - Add Recommends on telepathy-butterfly and telepathy-haze + - Add Suggests on telepathy-idle + + -- Laurent Bigonville Mon, 22 Sep 2008 23:32:45 +0200 + +empathy (2.24.0-1) experimental; urgency=low + + * New upstream release. + + -- Laurent Bigonville Mon, 22 Sep 2008 21:37:47 +0200 + +empathy (2.23.92-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat + dialogs + * Re-add lost recommends and suggests on tp-butterfly, tp-haze and tp-idle + + -- Laurent Bigonville Wed, 10 Sep 2008 00:09:14 +0200 + +empathy (2.23.92-1) experimental; urgency=low + + * New upstream release + - Adjust libempathy-gtk15.symbols + * Use my debian.org address in Uploaders + + -- Laurent Bigonville Tue, 09 Sep 2008 19:03:12 +0200 + +empathy (2.23.91-0ubuntu1) intrepid; urgency=low + + * New upstream release + - Adjust libempathy-gtk15.symbols + * Put the telepathy team as maintainer of the package + + -- Laurent Bigonville Tue, 02 Sep 2008 19:48:54 +0200 + +empathy (2.23.90-2) experimental; urgency=low + + * debian/libempathy14.symbols: Fix version of an exported symbol + * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep + * Bump build-deps and remove libtelepathy-dev (not needed anymore) + * Remove --enable-voip flags (voip enabled by default), rename + --enable-aspell to --enable-spell + * Add explicit build-depends against libglib2.0-dev + * Install gnome help and omf files in empathy package + + -- Laurent Bigonville Mon, 25 Aug 2008 08:04:11 +0200 + +empathy (2.23.90-1) experimental; urgency=low + + * New upstream release. + + -- Dafydd Harries Sun, 24 Aug 2008 22:03:36 +0100 + +empathy (2.23.90-0ubuntu1) intrepid; urgency=low + + * New upstream release, adjust symbols files + * Revert to cdbs instead of debhelper 7 + * Move Scott James Remnant patch to debian/patches + + -- Laurent Bigonville Wed, 20 Aug 2008 19:00:04 +0200 + +empathy (2.23.6-0ubuntu8) intrepid; urgency=low + + * Finally got something like the effect I was after. + + -- Scott James Remnant Mon, 18 Aug 2008 12:01:35 +0100 + +empathy (2.23.6-0ubuntu7) intrepid; urgency=low + + * Err, it wasn't a homogenous tabs problem, it was simply a packing + problem. + + -- Scott James Remnant Mon, 18 Aug 2008 11:42:55 +0100 + +empathy (2.23.6-0ubuntu6) intrepid; urgency=low + + * Don't use homogeneous tabs in the chat window. + + -- Scott James Remnant Mon, 18 Aug 2008 10:32:43 +0100 + +empathy (2.23.6-0ubuntu5) intrepid; urgency=low + + * Install gnome help and omf files in empathy package (LP: #257189) + + -- Laurent Bigonville Thu, 14 Aug 2008 18:53:35 +0200 + +empathy (2.23.6-0ubuntu4) intrepid; urgency=low + + * Demotte telepathy-idle to Suggests + + -- Laurent Bigonville Mon, 11 Aug 2008 23:37:22 +0200 + +empathy (2.23.6-0ubuntu3) intrepid; urgency=low + + * Add telepathy-idle as recommends for the empathy package (LP: #256783) + + -- David Futcher Mon, 11 Aug 2008 16:34:16 +0100 + +empathy (2.23.6-0ubuntu2) intrepid; urgency=low + + * Add telepathy-butterfly and telepathy-haze as recommends for the empathy + package + + -- Laurent Bigonville Fri, 08 Aug 2008 17:02:45 +0200 + +empathy (2.23.6-0ubuntu1) intrepid; urgency=low + + * New upstream release + * Drop debian/patches/00_mark_unknown_presence_id_as_unset.patch: applied + upstream + * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep + * Bump debhelper compat to 7 + * Use new dh mechanism instead of cdbs + * Bump build-deps and remove libtelepathy-dev (not needed anymore) + * Remove --enable-voip flags (voip enabled by default), rename + --enable-aspell to --enable-spell + + -- Laurent Bigonville Fri, 08 Aug 2008 16:15:17 +0200 + +empathy (0.23.4-1) experimental; urgency=low + + [ Laurent Bigonville ] + * Bump Standards-Version to 3.8.0 (no further changes) + + [ Sjoerd Simons ] + * New upstream release + * Bumped soname of libempathy-gtk again and update symbols file + * Add a version depend on telepathy-glib-dev matching the configure.ac + + -- Sjoerd Simons Sat, 02 Aug 2008 22:08:58 +0100 + +empathy (0.23.3-3) unstable; urgency=low + + * Use my debian.org address in Uploaders + * debian/patches/00empathy_486683.patch: Fix crash when adding SIP contacts + (Closes: #486683) + + -- Laurent Bigonville Sat, 25 Oct 2008 00:30:02 +0200 + +empathy (0.23.3-2) unstable; urgency=low + + * Add recommend on gvfs-backends. These are used for the url handlers in the + chat window. + * debian/patches/00_mark_unknown_presence_id_as_unset.patch + + Added. Mark presence as unknown when the presence string isn't + recognized + + -- Sjoerd Simons Sat, 02 Aug 2008 19:56:46 +0100 + +empathy (0.23.3-1ubuntu2) intrepid; urgency=low + + * Also pass --disable-scrollkeeper to configure. + (fixes FTBFS, LP: #247720, #253295) + + -- Michael Bienia Wed, 30 Jul 2008 16:36:27 +0200 + +empathy (0.23.3-1ubuntu1) intrepid; urgency=low + + * libempathy-gtk/empathy-ui-utils.c, src/empathy-status-icon.c: + - Add format "%s" to function calls. Fixes FTBFS caused by default compiler + flags (error: format not a string literal and no format arguments) + * Modify Maintainer value to match the DebianMaintainerField specification. + + -- Albin Tonnerre Thu, 19 Jun 2008 12:33:47 +0200 + +empathy (0.23.3-1) unstable; urgency=low + + [ Sjoerd Simons ] + * New upstream release (0.23.3) + * Bump libempathy and libempathy-gtk sonames + * debian/*.symbols: Remove the debian version number from all symbols + + [ Laurent Bigonville ] + * New upstream release (0.23.2) + - Bump libempathy and libempathy-gtk soname and fix symbols files + * Add dbus-x11 dependency on empathy package (Closes: #480486) + * Add licence information about files libempathy-gtk/totem-subtitle-encoding.c + and libempathy-gtk/totem-subtitle-encoding.h + + -- Sjoerd Simons Fri, 06 Jun 2008 17:14:31 +0100 + +empathy (0.23.1-1) unstable; urgency=low + + [ Laurent Bigonville ] + * debian/control: Add telepathy-stream-engine as a recommends for empathy + package + + [ Sjoerd Simons ] + * New upstream release + * debian/control: Add conflict with older version of stream-engine + * debian/patches/00_fix_python_bindings.patch: + - Removed. Fixed upstream + * debian/patches/01_remove_unused_code.patch: + - Removed. Fixed upstream + * Bump libempathy and libempathy-gtk soname + * debian/control: Add build-depend on gnome-doc-utils + + [ Simon McVittie ] + * Use my debian.org address in Uploaders + + -- Sjoerd Simons Thu, 01 May 2008 11:42:57 +0200 + +empathy (0.22.1-1) unstable; urgency=low + + * debian/rules, debian/empathy.install: Enable VOIP support + * debian/empathy.install: Chat handler is now part of the main empathy + process + * debian/patches/00_fix_python_bindings.patch: + + Added. Don't try to import objects that don't exist anymore (from + upstream git) (Closes: #474260) + * debian/patches/01_remove_unused_code.patch: + + Added. Remove unused code. Fixes compilation errors with Gcc 4.3 + (Closes: #466817) + * debian/libempathy-gtk11.symbols, debian/libempathy-gtk11.shlibs: Update + symbols and shlibs + + -- Sjoerd Simons Sun, 06 Apr 2008 23:33:50 +0200 + +empathy (0.22.0-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Mon, 10 Mar 2008 16:39:07 +0100 + +empathy (0.21.91-1) unstable; urgency=low + + * New upstream release + * debian/patches/00_set_null_presence_message.patch: + - Removed. Merged upstream + * debian/control: Add xsltproc to build-depends + * Bump libempathy and libempathy-gtk soname to 11 + * debian/control: Bump libtelepathy-dev build-depend to 0.3.1 + * debian/libempathy-common.install: Add irc network definitions + + -- Sjoerd Simons Mon, 03 Mar 2008 20:45:26 +0100 + +empathy (0.21.90-2) unstable; urgency=low + + * debian/*.symbols: Remove the debian versioning + * debian/patches/00_set_null_presence_message.patch: + - Added. If there is no presence-message, (re)set it to NULL. So the UI + can choose the right default message + + -- Sjoerd Simons Sun, 10 Feb 2008 12:46:53 +0100 + +empathy (0.21.90-1) unstable; urgency=low + + * New upstream release + * Removed patches merge upstream: + - debian/patches/fix-pyftbfs.patch + - debian/patches/accounts-icons-path.patch + * Bump sonames for libempathy and libempathy-gtk + + -- Sjoerd Simons Sat, 09 Feb 2008 23:25:59 +0100 + +empathy (0.21.5.2-1) unstable; urgency=low + + [ Laurent Bigonville ] + * New upstream release (0.21.5.2) + * Add XS-Dm-Upload-Allowed: yes, really + * Bump libmissioncontrol-client-dev build-dep version + * Bump soname of libempathy-gtk + * Drop debian/msn-haze.profile: merged upstream + * debian/patches/fix-pyftbfs.patch: Fix FTBFS of the python binding + (taken from upstream) + * debian/patches/accounts-icons-path.patch: Fix search path for icons (taken + from upstream) + * debian/rules: remove installed test program + + [ Sjoerd Simons ] + * Add symbol files for libempathy and libempathy-gtk + * libempathy7: Bumped shlibs + * debian/libempathy-common.install: Install empathy-log-manager.xsl + * debian/libempathy-common, debian/libempathy-gtk-common.install: Install + empathy-chatroom-manager.dtd in libempathy-common instead of + libempathy-gtk-common + * debian/control: Let libempathy-common conflict with older versions of + libempathy-gtk-common + * debian/rules: Disable the building of tests + + -- Sjoerd Simons Mon, 21 Jan 2008 20:28:49 +0100 + +empathy (0.21.4-1) unstable; urgency=low + + [ Laurent Bigonville ] + * New upstream release + * Bump Standards-Version to 3.7.3, no further changes. + + [ Sjoerd Simons ] + * debian/patches/fix_setting_avatar.patch + - Added. Fix setting avatars + * debian/patches/listen_to_presence_changed.patch + - Added. Listen to the PresenceChanged signal from the MC instead of the + deprecated PresenceStatusActual. + + -- Sjoerd Simons Sat, 05 Jan 2008 19:06:01 +0100 + +empathy (0.21.3-1) unstable; urgency=low + + * New upstream release + * Add XS-Dm-Upload-Allowed: yes + * Bump soname of both libraries + * Drop debian/patches/00_configure.patch: applied upstream + * Make -common packages arch:all and let the libs depends on + ${source:Version} of their respective -common packages again. + * Let the -dev packages depends on ${binary:Version} of their + respective lib packages. + + -- Laurent Bigonville Tue, 04 Dec 2007 00:00:31 +0100 + +empathy (0.21.2-2) unstable; urgency=low + + * debian/patches/00_configure.patch + - Added. Use the pkg-config file for X11 to get the right linker arguments + Fixes FTBFS (Closes: #451902) + + -- Sjoerd Simons Wed, 21 Nov 2007 20:59:11 +0100 + +empathy (0.21.2-1) unstable; urgency=low + + [ Laurent Bigonville ] + * New upstream release, bump soname for both libraries + * Drop debian/patch/add-haze-profiles.patch and add debian/msn-haze.profile + to avoid patching autofoo, installing it via debian/rules + * debian/empathy.install: empathy.desktop is now installed in + /etc/xdg/autostart/ + * debian/libempathy-gtk-common.install: + - Also install icons that are under /usr/share/empathy/icons/ + * debian/control: + - Add gnome-icon-theme to libempathy-gtk-common dependencies + - Bump libmissioncontrol-client-dev build-dep version + * Add manpages for empathy and empathy-account, + thanks to Simon McVittie (Closes: #448620) + * Use now official Vcs-* field + * Install empathy-chat-chandler in /usr/lib/empathy/ + * Disable voip support and remove recommends for tp-se, not stable enough yet + * Install .desktop file in /usr/share/applications + + [ Sjoerd Simons ] + * debian/control: Let the libs depend on ${binary:Version} of their + respective -common packages. + + -- Sjoerd Simons Fri, 16 Nov 2007 11:03:08 +0100 + +empathy (0.14-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #89431) + - Depends: telepathy-gabble | telepathy-connection-manager, + - Suggests: telepathy-core. + - Change Conflicts and Replaces accordingly + - Change bzr url to the Ubuntu branch + * Drop debian/patches/no-date-crash.patch and + debian/patches/search-contact-list.patch: applied upstream + * debian/patches/add-haze-profiles.patch: use debian one + + -- Laurent Bigonville Wed, 24 Oct 2007 12:23:47 +0200 + +empathy (0.14-1) unstable; urgency=low + + [ Loic Minier ] + * Fix typo in control. + + [ Laurent Bigonville ] + * New upstream version + - Drop debian/patches/disable-voip.patch, applied upstream + * Enable VOIP and add telepathy-stream-engine to Recommends + + -- Laurent Bigonville Mon, 01 Oct 2007 18:46:11 +0200 + +empathy (0.13-1) unstable; urgency=low + + [ Laurent Bigonville ] + * New upstream release, bump soname for libempathy and libempathy-gtk + - Drop build-dep on libgnomeui-dev + - Add build-dep on libpanel-applet2-dev + - Bump build-dep version of libgtk2.0-dev + - Build and install the megaphone applet + - Add libtelepathy-dev as build-dep + * Fix typo in libempathy-dev description + * debian/patches/add-haze-profiles.patch: ship .profile files to support + telepathy-haze (Closes: #444032) + + [ Sjoerd Simons ] + * debian/patches/disable-voip.patch: Disable voip user interface elements as + their noops in this version. + * debian/copyright: Updated + + -- Sjoerd Simons Sat, 29 Sep 2007 18:41:39 +0200 + +empathy (0.12-2ubuntu2) gutsy; urgency=low + + * debian/control: Fix typo => telepathy-core (LP: #146415) + + -- Laurent Bigonville Fri, 28 Sep 2007 20:28:26 +0200 + +empathy (0.12-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining Ubuntu changes: (LP: #138027) + - Add profiles for haze support + - Depends: telepathy-gabble | telepathy-connection-manager, + - Suggests: telepaty-core. + * Add debian/patches/no-date-crash.patch: Fix crash if there is no date in + conversation (Taken from upstream) + * Add debian/patches/search-contact-list.patch: Fix search function in + contact list (Taken from upstream) + * Fix typo in libempathy-dev description + * Change Conflicts and Replaces accordingly + * Change bzr url to the Ubuntu branch + + -- Laurent Bigonville Mon, 10 Sep 2007 17:12:54 +0200 + +empathy (0.12-2) unstable; urgency=low + + * debian/control: Let the -common packages conflict and replace the old + empathy + * debian/control: Let libempathy-gtk-dev depends on libglade2-dev instead of + libglade-dev + * debian/control: Tighten depends of libempathy-gtk-dev a bit more + + -- Sjoerd Simons Sat, 08 Sep 2007 21:00:58 +0200 + +empathy (0.12-1) unstable; urgency=low + + [ Sjoerd Simons ] + * New upstream release + * Conflict with cohoba and gossip-telepathy + + [ Laurent Bigonville ] + * debian/control: + - Add myself as Uploaders + - Add libaspell-dev and iso-codes as build-dep and enable spellchecker + - Add XS-Vcs-Bzr field + - Bump mission-control build-dep + - Remove unneeded libmissioncontrol-sever builddep and rename + libmissioncontrol-dev to libmissioncontrol-client-dev + + [ Loic Minier ] + * Tweak copyright. + * Wrap build-deps and deps. + * Use HTTP in watch file. + * Include CDBS' utils.mk. + + [ Sjoerd Simons ] + * Added build-depend on libebook1.2-dev + * Split up empathy into a whole slew of packages + * Set linker flags to -Wl,-z,defs -Wl,-O1 + * debian/rules: Call dh_pysupport on python-empathy + * debian/control, debian/rules: Explicitely enable the python bindings + + -- Sjoerd Simons Sat, 25 Aug 2007 18:41:08 +0200 + +empathy (0.12-0ubuntu2) gutsy; urgency=low + + * debian/control: + - Depends: telepathy-gabble | telepathy-connection-manager (LP: #137689), + - Suggests: telepaty-core. + + -- Daniel Holbach Thu, 06 Sep 2007 09:18:01 +0200 + +empathy (0.12-0ubuntu1) gutsy; urgency=low + + * Fake sync with not yet published version + + -- Laurent Bigonville Sat, 25 Aug 2007 01:02:43 +0200 + +empathy (0.10-0ubuntu2) gutsy; urgency=low + + * Add profiles for haze support + + -- Matthew Garrett Tue, 21 Aug 2007 19:19:41 +0100 + +empathy (0.10-0ubuntu1) gutsy; urgency=low + + * New upstream release + + -- Baptiste Mille-Mathias Mon, 30 Jul 2007 18:49:02 +0200 + +empathy (0.8-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/control: add libaspell-dev, iso-codes to Build-Depends + - debian/rules: --enable-aspell + - Update Maintainer field to match Debian-Maintainer-Spec + + -- Vincent Legout Tue, 3 Jul 2007 11:56:56 +0200 + +empathy (0.8-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Sat, 23 Jun 2007 14:45:31 +0100 + +empathy (0.8-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - Fixed contact list handling. + - Make use of NetworkManager to set presence to OFFILE when we are + disconnected and restore presence once we are reconnected. + - UI for searching in conversation history and to view all conversations + with a given contact. + - Do not use 2 different processes (empathy and empathy-chat), merge them + into one client. This is easier for debugging and share data. + - Do not create log directory for a chat if there is no messages to put + in. + - Do not set active contacts when creating the store, and when contact + groups changed. + - Fix warning when using command-line options. + - Ignore ssl errors by default. This is needed to connect jabber accounts + using ssl. + - Adding spellcheck support using aspell. + - Lots of bugs fixed. + * debian/control: add libaspell-dev, iso-codes to Build-Depends. + * debian/rules: --enable-aspell. + + -- Daniel Holbach Thu, 21 Jun 2007 22:43:45 +0200 + +empathy (0.7-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Mon, 11 Jun 2007 10:31:19 +0200 + +empathy (0.6-1) unstable; urgency=low + + [ Dafydd Harries ] + * Add watch file. + + [ Sjoerd Simons ] + * New upstream release + + -- Sjoerd Simons Mon, 04 Jun 2007 09:27:47 +0200 + +empathy (0.5-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Sat, 26 May 2007 19:02:41 +0200 + +empathy (0.4-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Sun, 20 May 2007 15:31:42 +0200 + +empathy (0.3-1) unstable; urgency=low + + * Initial release + + -- Sjoerd Simons Mon, 14 May 2007 22:32:24 +0200 + --- empathy-2.27.3.orig/debian/control +++ empathy-2.27.3/debian/control @@ -0,0 +1,234 @@ +Source: empathy +Section: gnome +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Telepathy maintainers +Uploaders: Sjoerd Simons , + Dafydd Harries , + Simon McVittie , + Riccardo Setti , + Laurent Bigonville , + Jonny Lamb +Build-Depends: cdbs, + debhelper (>= 7), + rarian-compat, + librarian-dev, + libglib2.0-dev (>= 2.16.0), + libgtk2.0-dev (>= 2.16.0), + libpanel-applet2-dev (>= 2.10.0), + libgconf2-dev (>= 1.2.0), + libtelepathy-glib-dev (>= 0.7.31), + libmissioncontrol-client-dev (>= 4.61), + intltool, + libenchant-dev (>= 1.2.0), + iso-codes, + libebook1.2-dev, + python-gtk2-dev, + python-support (>= 0.3), + xsltproc, + gnome-doc-utils (>= 0.3.2), + libcanberra-gtk-dev (>= 0.4), + libnotify-dev (>= 0.4.4), + libtelepathy-farsight-dev (>= 0.0.4), + libgstreamer0.10-dev, + libgstreamer-plugins-base0.10-dev, + libindicate-dev (>= 0.1.6) +Standards-Version: 3.8.1 +Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git +Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git +Homepage: http://live.gnome.org/Empathy + +Package: empathy +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + dbus-x11 +Recommends: telepathy-gabble, + telepathy-salut, + telepathy-butterfly, + telepathy-haze, + gvfs-backends +Suggests: telepathy-idle +Description: High-level library and user-interface for Telepathy + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This packet contains the empathy IM application and account manager. + +Package: libempathy-common +Architecture: all +Section: misc +Conflicts: empathy (<< 0.12-1), libempathy-gtk-common (<< 0.21.5.2) +Replaces: empathy (<< 0.12-1) +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (library common files) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This packet contains common files for libempathy + + +Package: libempathy26 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libempathy-common (= ${source:Version}), + telepathy-mission-control +Conflicts: cohoba, + gossip-telepathy +Description: High-level library and user-interface for Telepathy (low-level library) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This packages contains the low-level empathy library + +Package: libempathy-doc +Architecture: all +Section: doc +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (library documentation) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This package contains documentation for libempathy + +Package: libempathy-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libmissioncontrol-client-dev, + libglib2.0-dev, + libxml2-dev, + libtelepathy-dev, + libempathy26 (= ${binary:Version}) +Description: High-level library and user-interface for Telepathy (library dev files) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This package contains development files for libempathy + +Package: libempathy-gtk-doc +Architecture: all +Section: doc +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (GTK documentation) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This package contains documentation for libempathy-gtk + +Package: libempathy-gtk-common +Architecture: all +Section: misc +Conflicts: empathy (<< 0.12-1) +Replaces: empathy (<< 0.12-1) +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-icon-theme +Description: High-level library and user-interface for Telepathy (GTK common files) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This package contains common files for libempathy-gtk + +Package: libempathy-gtk24 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libempathy-gtk-common (= ${source:Version}) +Description: High-level library and user-interface for Telepathy (GTK library) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This package contains a library of widgets for use in IM applications. + +Package: libempathy-gtk-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libempathy-dev, + libempathy-gtk24 (= ${binary:Version}), + libgtk2.0-dev (>= 2.16.0) +Description: High-level library and user-interface for Telepathy (GTK dev files) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This package contains development files for libempathy-gtk + +Package: python-empathy +Architecture: any +Section: python +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends} +XB-Python-Version: ${python:Versions} +Description: High-level library and user-interface for Telepathy (python bindings) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This package contains Python bindings for libempathy and libempathy-gtk + +Package: empathy-megaphone-applet +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (megaphone applet) + Empathy consists of a rich set of reusable instant messaging widgets, and a + GNOME client using those widgets. It uses Telepathy and Nokia's Mission + Control, and reuses Gossip's UI. The main goal is to permit desktop + integration by providing libempathy and libempathy-gtk libraries. + libempathy-gtk is a set of powerful widgets that can be embeded into any + GNOME application. + . + This packet contains the megaphone applet + . + The megaphone applet let you start a conversiation with a contact + and see his status directly from the gnome-panel. --- empathy-2.27.3.orig/debian/compat +++ empathy-2.27.3/debian/compat @@ -0,0 +1 @@ +7 --- empathy-2.27.3.orig/debian/libempathy26.install +++ empathy-2.27.3/debian/libempathy26.install @@ -0,0 +1 @@ +usr/lib/libempathy.so.* --- empathy-2.27.3.orig/debian/copyright +++ empathy-2.27.3/debian/copyright @@ -0,0 +1,115 @@ +This package was debianized by Sjoerd Simons on +Mon, 14 May 2007 22:32:24 +0200. + +It was downloaded from: + http://ftp.gnome.org/pub/GNOME/sources/empathy/ + +Upstream Authors: + Xavier Claessens + Richard Hult + Michael Hallendal + Martyn Russell + Raphaël Slinckx + +Files: * +Copyright: + Copyright (C) 2000 Eazel, Inc. + Copyright (C) 2000-2005 Paolo Maggi + Copyright (C) 2002-2003 Jeroen Zwartepoorte + Copyright (C) 2002-2004 Marco Presenti Gritti + Copyright (C) 2002-2006 Imendio AB + Copyright (C) 2003-2004 Xan Lopez + Copyright (C) 2003 Bastien Nocera + Copyright (C) 2004 Red Hat, Inc. + Copyright (C) 2004-2005 Martyn Russel + Copyright (C) 2004-2006 Christian Persch + Copyright (C) 2006 Xavier Claessens + Copyright (C) 2007-2008 Marco Barisione + Copyright (C) 2007 Raphael Slinckx + Copyright (C) 2007 Guillaume Desmottes + Copyright (C) 2007-2009 Collabora Ltd. +License: GPL-2+ + On Debian systems, the complete text of the GPL-2 can be found in + /usr/share/common-licenses/GPL-2. + +Files: libempathy-gtk/empathy-avatar-chooser.* +Copyright: + Copyright (C) 2006-2007 Imendio AB. + Copyrihgt (C) 2007-2008 Collabora Ltd. +License: GPL-2 + On Debian systems, the complete text of the GPL-2 can be found in + /usr/share/common-licenses/GPL-2. + +Files: src/empathy-status-icon.*, src/empathy-event-manager.*, + src/empathy-tube-dispatch.*, src/empathy-call-window.*, + libempathy-gtk/empathy-video-src.*, libempathy-gtk/empathy-audio-src.*, + libempathy/empathy-call-factory.*, libempathy/empathy-tp-contact-list.*, + libempathy/empathy-dispatcher.*, libempathy/empathy-tp-file.*, + libempathy/empathy-irc-network-manager.*, libempathy/empathy-tp-call.*, + libempathy/empathy-tp-tube.*, libempathy/empathy-idle.*, + libempathy/empathy-debug.*, libempathy/empathy-account-manager.*, + libempathy/empathy-contact-factory.*, libempathy/empathy-tp-roomlist.*, + libempathy/empathy-contact-monitor.*, libempathy/empathy-tp-group.*, + libempathy/empathy-contact-manager.*, libempathy/empathy-tube-handler.*, + libempathy/empathy-tp-contact-factory.*, libempathy/empathy-contact-list.*, + libempathy/empathy-irc-server.*, libempathy/empathy-tp-chat.*, + libempathy/empathy-chatroom.*, libempathy/empathy-call-handler.*, + libempathy/empathy-dispatch-operation.*, libempathy-gtk/empathy-contact-dialogs.*, + libempathy-gtk/empathy-contact-selector.*, libempathy-gtk/empathy-contact-widget.*, + libempathy-gtk/empathy-profile-chooser.*, libempathy-gtk/empathy-audio-sink.*, + libempathy-gtk/empathy-cell-renderer-activatable.*, libempathy-gtk/empathy-account-widget-irc.*, + libempathy-gtk/empathy-account-widget-sip.*, libempathy-gtk/empathy-video-src.*, + libempathy-gtk/empathy-smiley-manager.*, libempathy-gtk/empathy-irc-network-dialog.*, + libempathy-gtk/empathy-contact-menu.*, libempathy-gtk/totem-subtitle-encoding.*, + libempathy-gtk/empathy-video-widget.*, libempathy-gtk/empathy-new-message-dialog.*, + libempathy-gtk/empathy-audio-src.*, tools/* +Copyright: + Copyright (C) 2007-2009 Collabora Ltd. + Copyright (C) 2007 Xavier Claessens + Copyright (C) 2007 Elliot Fairweather + Copyright (C) 2007 Nokia Corporation + Copyright (C) 2007 Marco Barisione + Copyright (C) 2007-2008 Guillaume Desmottes + Copyright (C) 2007 Raphael Slinckx + Copyright (C) 2001-2006 Bastien Nocera +License: LGPL-2.1+ + On Debian systems, the complete text of the LGPL-2.1 can be found in + /usr/share/common-licenses/LGPL-2.1. + +Files: po/* +Copyright: + Copyright 2002-2006 Free Software Foundation, Inc. + Copyright 2002-2003 Richard Hult + Copyright 2003-2004 Christian Rose + Copyright 2006 Daniel Nylander +License: GPL-2 + On Debian systems, the complete text of the GPL-2 can be found in + /usr/share/common-licenses/GPL-2. + +Files: help/* +Copyright: + Copyright 2008 Daniel Dylander + Copyright 2008-2009 Ubuntu Documentation Project + Copyright 2008 Lucas Lommer + Copyright 2008 Joan Duran + Copyright 2008 Mario Blattermann + Copyright 2008 Philipp Kerling + Copyright 2008-2009 Jorge Gonzalez + Copyright 2008 Marc Vellet + Copyright 2008 Bruno Brouard + Copyright 2008 Claude Paroz + Copyright 2008 Никита Белобров +License: GFDL-1.1+ + Permission is granted to copy, distribute and/or modify this document under + the terms of the GNU Free Documentation License, Version 1.1 or any later + version published by the Free Software Foundation; with no Invariant + Sections, no Front-Cover Texts, and no Back-Cover Texts. + . + On Debian systems, the complete text of the GFDL-1.2 can be found in + /usr/share/common-licenses/GFDL-1.2. + +Files: debian/* +Copyright: Copyright 2007-2009 Sjoerd Simons +License: GPL-2+ + On Debian systems, the complete text of the GPL-2 can be found in + /usr/share/common-licenses/GPL-2. --- empathy-2.27.3.orig/debian/empathy.1 +++ empathy-2.27.3/debian/empathy.1 @@ -0,0 +1,24 @@ +.TH EMPATHY "1" "October 2007" "Telepathy project" "User Commands" +.SH NAME +empathy \- GNOME instant messaging client using Telepathy +.SH SYNOPSIS +empathy +.SH DESCRIPTION +Empathy consists of a rich set of reusable instant messaging widgets, and a +GNOME client using those widgets. +It uses Telepathy and Nokia's Mission Control, and reuses Gossip's UI. +.PP +The main user interface consists of a contact list window and an icon in the +notification area. +.SH OPTIONS +There are no command-line options. +.SH ENVIRONMENT +.TP +\fBEMPATHY_LOGFILE\fR=\fIfilename\fR +If set, debug output will go to the given file rather than to stderr. +.TP +\fBEMPATHY_DEBUG\fR=\fItype\fR +May be set to "all" for full debug output, or various undocumented options +(which may change from release to release) to filter the output. +.SH SEE ALSO +\fIhttp://telepathy.freedesktop.org/\fR, \fIhttp://live.gnome.org/Empathy\fR --- empathy-2.27.3.orig/debian/empathy-megaphone-applet.install +++ empathy-2.27.3/debian/empathy-megaphone-applet.install @@ -0,0 +1,4 @@ +etc/gconf/schemas/GNOME_Megaphone_Applet.schemas +usr/share/empathy/GNOME_Megaphone_Applet.xml +usr/lib/bonobo/servers/GNOME_Megaphone_Applet.server +usr/lib/empathy/megaphone-applet --- empathy-2.27.3.orig/debian/python-empathy.install +++ empathy-2.27.3/debian/python-empathy.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/*.so --- empathy-2.27.3.orig/debian/watch +++ empathy-2.27.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/empathy/([0-9.]+)/empathy-(.*).tar.gz --- empathy-2.27.3.orig/debian/libempathy-dev.install +++ empathy-2.27.3/debian/libempathy-dev.install @@ -0,0 +1,4 @@ +usr/include/libempathy +usr/lib/libempathy.so +usr/lib/libempathy.a +usr/lib/pkgconfig/libempathy.pc --- empathy-2.27.3.orig/debian/libempathy-gtk24.install +++ empathy-2.27.3/debian/libempathy-gtk24.install @@ -0,0 +1 @@ +usr/lib/libempathy-gtk*.so.* --- empathy-2.27.3.orig/debian/empathy.install +++ empathy-2.27.3/debian/empathy.install @@ -0,0 +1,4 @@ +usr/bin/ +usr/share/applications/empathy.desktop +usr/share/gnome/help/empathy/ +usr/share/omf/empathy/ --- empathy-2.27.3.orig/debian/README.source +++ empathy-2.27.3/debian/README.source @@ -0,0 +1,58 @@ +Patches +======= + +This package uses cdbs simple-patch-system to store modifications to the +upstream source. + +To get the fully patched source: make -f debian/rules patch + +To revert to what's in git: make -f debian/rules unpatch + +To add a patch: obtain a diff and put it in debian/patches, or see below + +To remove an existing patch: delete it from debian/patches + +Packaging using git +=================== + +The repository contains an appropriate debian/gbp.conf to build this package +using git-buildpackage. The debian branch contains the latest upstream versions +(for unstable, or experimental while a freeze is in progress). The debian-lenny +branch contains versions targeted for lenny, etc. + +Here's how to build it: + + git clone git://git.debian.org/git/pkg-telepathy/empathy.git + cd empathy + git checkout debian + git-buildpackage -us -uc + +or for testing/stable branches like debian-lenny: + + git clone git://git.debian.org/git/pkg-telepathy/empathy.git + cd empathy + git checkout debian-lenny + git-buildpackage -us -uc --git-debian-branch=debian-lenny + +The branch 'upstream' is a copy of the contents of upstream tarballs. To import +upstream tarballs use: + + git checkout debian + git-import-orig ~/empathy-2.x.tar.gz + +The branch 'debian-patches' is 'upstream' plus any patches needed for Debian. +It should be rebased on 'upstream' after each upstream release: + + git checkout debian-patches + git rebase upstream + +The preferred way of adding patches is to cherry pick from an upstream +repository: + + git remote add collabora \ + git+ssh://git.collabora.co.uk/git/empathy.git + git fetch + git checkout debian-patches + git cherry-pick xxxxxxxxxxxxxx + git checkout debian + fakeroot debian/rules update-patches --- empathy-2.27.3.orig/debian/empathy-accounts.1 +++ empathy-2.27.3/debian/empathy-accounts.1 @@ -0,0 +1,12 @@ +.TH EMPATHY-ACCOUNTS "1" "October 2007" "Telepathy project" "User Commands" +.SH NAME +empathy\-accounts \- configure Telepathy instant messaging accounts +.SH SYNOPSIS +empathy\-accounts +.SH DESCRIPTION +empathy-accounts displays a graphical (Gtk+) dialog where the instant messaging +accounts used by Empathy (via Telepathy Mission Control) can be configured. +.SH OPTIONS +There are no command-line options. +.SH SEE ALSO +\fIhttp://telepathy.freedesktop.org/\fR, \fIhttp://live.gnome.org/Empathy\fR --- empathy-2.27.3.orig/debian/libempathy-common.install +++ empathy-2.27.3/debian/libempathy-common.install @@ -0,0 +1,7 @@ +usr/share/mission-control +usr/share/locale +usr/share/empathy/empathy-chatroom-manager.dtd +usr/share/empathy/empathy-log-manager.xsl +usr/share/empathy/empathy-irc-networks.dtd +usr/share/empathy/irc-networks.xml + --- empathy-2.27.3.orig/debian/libempathy-gtk-common.install +++ empathy-2.27.3/debian/libempathy-gtk-common.install @@ -0,0 +1,7 @@ +etc/gconf/schemas/empathy.schemas +usr/share/icons/ +usr/share/empathy/icons/ +usr/share/empathy/*.ui +usr/share/empathy/empathy-contact-groups.dtd +usr/share/empathy/empathy-status-presets.dtd +usr/share/empathy/Template.html --- empathy-2.27.3.orig/debian/empathy.manpages +++ empathy-2.27.3/debian/empathy.manpages @@ -0,0 +1,3 @@ +debian/empathy.1 +debian/empathy-accounts.1 +debian/empathy-logs.1 --- empathy-2.27.3.orig/debian/libempathy-gtk-doc.install +++ empathy-2.27.3/debian/libempathy-gtk-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/libempathy-gtk/ --- empathy-2.27.3.orig/debian/libempathy-doc.install +++ empathy-2.27.3/debian/libempathy-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/libempathy/ --- empathy-2.27.3.orig/debian/libempathy-gtk-dev.install +++ empathy-2.27.3/debian/libempathy-gtk-dev.install @@ -0,0 +1,4 @@ +usr/include/libempathy-gtk +usr/lib/libempathy-gtk*.so +usr/lib/libempathy-gtk*.a +usr/lib/pkgconfig/libempathy-gtk.pc --- empathy-2.27.3.orig/debian/libempathy26.symbols +++ empathy-2.27.3/debian/libempathy26.symbols @@ -0,0 +1,325 @@ +libempathy.so.26 libempathy26 #MINVER# + empathy_account_equal@Base 0.21.91 + empathy_account_hash@Base 0.21.91 + empathy_account_manager_dup_accounts@Base 2.27.1.1 + empathy_account_manager_dup_connections@Base 2.27.1.1 + empathy_account_manager_dup_singleton@Base 2.25.4 + empathy_account_manager_get_account@Base 2.27.1.1 + empathy_account_manager_get_connected_accounts@Base 2.25.4 + empathy_account_manager_get_connecting_accounts@Base 2.25.4 + empathy_account_manager_get_connection@Base 2.27.1.1 + empathy_account_manager_get_count@Base 2.25.91 + empathy_account_manager_get_type@Base 2.25.4 + empathy_account_manager_is_account_just_connected@Base 2.25.4 + empathy_avatar_get_type@Base 0.21.91 + empathy_avatar_new@Base 0.21.91 + empathy_avatar_ref@Base 0.21.91 + empathy_avatar_save_to_file@Base 0.23.4 + empathy_avatar_unref@Base 0.21.91 + empathy_call_factory_claim_channel@Base 2.25.91 + empathy_call_factory_get@Base 2.25.91 + empathy_call_factory_get_type@Base 2.25.91 + empathy_call_factory_initialise@Base 2.25.91 + empathy_call_factory_new_call@Base 2.25.91 + empathy_call_factory_new_call_with_streams@Base 2.27.1.1 + empathy_call_handler_bus_message@Base 2.25.92 + empathy_call_handler_get_type@Base 2.25.91 + empathy_call_handler_has_initial_video@Base 2.27.3 + empathy_call_handler_new_for_channel@Base 2.25.91 + empathy_call_handler_new_for_contact@Base 2.25.91 + empathy_call_handler_new_for_contact_with_streams@Base 2.27.1.1 + empathy_call_handler_start_call@Base 2.25.91 + empathy_call_handler_stop_call@Base 2.27.3 + empathy_capabilities_get_type@Base 0.21.91 + empathy_chatroom_equal@Base 0.21.91 + empathy_chatroom_get_account@Base 0.21.91 + empathy_chatroom_get_auto_connect@Base 0.21.91 + empathy_chatroom_get_invite_only@Base 2.27.1.1 + empathy_chatroom_get_members_count@Base 2.27.1.1 + empathy_chatroom_get_name@Base 0.21.91 + empathy_chatroom_get_need_password@Base 2.27.1.1 + empathy_chatroom_get_room@Base 0.21.91 + empathy_chatroom_get_subject@Base 2.27.1.1 + empathy_chatroom_get_tp_chat@Base 2.25.91 + empathy_chatroom_get_type@Base 0.21.91 + empathy_chatroom_is_favorite@Base 2.27.1.1 + empathy_chatroom_manager_add@Base 0.21.91 + empathy_chatroom_manager_dup_singleton@Base 2.25.91 + empathy_chatroom_manager_find@Base 0.21.91 + empathy_chatroom_manager_get_chatrooms@Base 0.21.91 + empathy_chatroom_manager_get_count@Base 0.21.91 + empathy_chatroom_manager_get_type@Base 0.21.91 + empathy_chatroom_manager_observe@Base 2.25.91 + empathy_chatroom_manager_remove@Base 0.21.91 + empathy_chatroom_new@Base 0.21.91 + empathy_chatroom_new_full@Base 0.21.91 + empathy_chatroom_set_account@Base 0.21.91 + empathy_chatroom_set_auto_connect@Base 0.21.91 + empathy_chatroom_set_favorite@Base 2.27.1.1 + empathy_chatroom_set_invite_only@Base 2.27.1.1 + empathy_chatroom_set_members_count@Base 2.27.1.1 + empathy_chatroom_set_name@Base 0.21.91 + empathy_chatroom_set_need_password@Base 2.27.1.1 + empathy_chatroom_set_room@Base 0.21.91 + empathy_chatroom_set_subject@Base 2.27.1.1 + empathy_chatroom_set_tp_chat@Base 2.27.1.1 + empathy_check_available_state@Base 2.25.91 + empathy_contact_can_send_files@Base 2.25.2 + empathy_contact_can_use_stream_tube@Base 2.27.3 + empathy_contact_can_voip@Base 0.21.91 + empathy_contact_get_account@Base 0.21.91 + empathy_contact_get_avatar@Base 0.21.91 + empathy_contact_get_capabilities@Base 0.21.91 + empathy_contact_get_connection@Base 2.27.1.1 + empathy_contact_get_handle@Base 0.21.91 + empathy_contact_get_id@Base 0.21.91 + empathy_contact_get_location@Base 2.27.1.1 + empathy_contact_get_name@Base 0.21.91 + empathy_contact_get_presence@Base 0.21.91 + empathy_contact_get_presence_message@Base 0.21.91 + empathy_contact_get_status@Base 0.21.91 + empathy_contact_get_tp_contact@Base 2.27.1.1 + empathy_contact_get_type@Base 0.21.91 + empathy_contact_group_get_expanded@Base 0.21.91 + empathy_contact_group_set_expanded@Base 0.21.91 + empathy_contact_groups_get_all@Base 0.21.91 + empathy_contact_is_online@Base 0.21.91 + empathy_contact_is_user@Base 0.21.91 + empathy_contact_list_add@Base 0.21.91 + empathy_contact_list_add_to_group@Base 0.21.91 + empathy_contact_list_get_all_groups@Base 0.21.91 + empathy_contact_list_get_groups@Base 0.21.91 + empathy_contact_list_get_members@Base 0.21.91 + empathy_contact_list_get_monitor@Base 2.25.4 + empathy_contact_list_get_pendings@Base 0.21.91 + empathy_contact_list_get_type@Base 0.21.91 + empathy_contact_list_remove@Base 0.21.91 + empathy_contact_list_remove_from_group@Base 0.21.91 + empathy_contact_list_remove_group@Base 0.21.91 + empathy_contact_list_rename_group@Base 0.21.91 + empathy_contact_load_avatar_cache@Base 0.23.3 + empathy_contact_load_avatar_data@Base 0.23.3 + empathy_contact_manager_can_add@Base 2.25.3 + empathy_contact_manager_dup_singleton@Base 2.25.91 + empathy_contact_manager_get_list@Base 0.21.91 + empathy_contact_manager_get_type@Base 0.21.91 + empathy_contact_monitor_get_type@Base 2.25.4 + empathy_contact_monitor_new_for_iface@Base 2.25.4 + empathy_contact_monitor_set_iface@Base 2.25.4 + empathy_contact_new@Base 0.21.91 + empathy_contact_new_for_log@Base 2.27.1.1 + empathy_contact_set_avatar@Base 0.21.91 + empathy_contact_set_capabilities@Base 0.21.91 + empathy_contact_set_handle@Base 0.21.91 + empathy_contact_set_id@Base 0.21.91 + empathy_contact_set_is_user@Base 0.21.91 + empathy_contact_set_location@Base 2.27.1.1 + empathy_contact_set_name@Base 0.21.91 + empathy_contact_set_presence@Base 0.21.91 + empathy_contact_set_presence_message@Base 0.21.91 + empathy_debug@Base 0.23.2 + empathy_debug_flag_is_set@Base 0.23.2 + empathy_debug_flags_get_type@Base 0.23.2 + empathy_debug_set_flags@Base 0.23.2 + empathy_dispatch_operation_approve@Base 2.25.91 + empathy_dispatch_operation_claim@Base 2.25.91 + empathy_dispatch_operation_get_channel@Base 2.25.91 + empathy_dispatch_operation_get_channel_type@Base 2.25.91 + empathy_dispatch_operation_get_channel_type_id@Base 2.25.91 + empathy_dispatch_operation_get_channel_wrapper@Base 2.25.91 + empathy_dispatch_operation_get_object_path@Base 2.25.91 + empathy_dispatch_operation_get_status@Base 2.25.91 + empathy_dispatch_operation_get_tp_connection@Base 2.25.91 + empathy_dispatch_operation_get_type@Base 2.25.91 + empathy_dispatch_operation_is_incoming@Base 2.25.91 + empathy_dispatch_operation_new@Base 2.25.91 + empathy_dispatch_operation_new_with_wrapper@Base 2.25.91 + empathy_dispatch_operation_start@Base 2.25.91 + empathy_dispatch_operation_state_get_type@Base 2.25.91 + empathy_dispatcher_chat_with_contact@Base 0.23.3 + empathy_dispatcher_chat_with_contact_id@Base 0.23.3 + empathy_dispatcher_create_channel@Base 2.25.91 + empathy_dispatcher_dup_singleton@Base 2.25.91 + empathy_dispatcher_find_requestable_channel_classes@Base 2.27.3 + empathy_dispatcher_find_requestable_channel_classes_async@Base 2.27.3 + empathy_dispatcher_get_type@Base 0.23.2 + empathy_dispatcher_join_muc@Base 2.25.91 + empathy_file_lookup@Base 0.23.1 + empathy_ft_error_enum_get_type@Base 2.27.3 + empathy_ft_factory_claim_channel@Base 2.27.3 + empathy_ft_factory_dup_singleton@Base 2.27.3 + empathy_ft_factory_get_type@Base 2.27.3 + empathy_ft_factory_new_transfer_outgoing@Base 2.27.3 + empathy_ft_factory_set_destination_for_incoming_handler@Base 2.27.3 + empathy_ft_handler_cancel_transfer@Base 2.27.3 + empathy_ft_handler_get_contact@Base 2.27.3 + empathy_ft_handler_get_content_type@Base 2.27.3 + empathy_ft_handler_get_filename@Base 2.27.3 + empathy_ft_handler_get_gfile@Base 2.27.3 + empathy_ft_handler_get_total_bytes@Base 2.27.3 + empathy_ft_handler_get_transferred_bytes@Base 2.27.3 + empathy_ft_handler_get_type@Base 2.27.3 + empathy_ft_handler_get_use_hash@Base 2.27.3 + empathy_ft_handler_incoming_set_destination@Base 2.27.3 + empathy_ft_handler_is_cancelled@Base 2.27.3 + empathy_ft_handler_is_completed@Base 2.27.3 + empathy_ft_handler_is_incoming@Base 2.27.3 + empathy_ft_handler_new_incoming@Base 2.27.3 + empathy_ft_handler_new_outgoing@Base 2.27.3 + empathy_ft_handler_start_transfer@Base 2.27.3 + empathy_idle_dup_singleton@Base 2.25.91 + empathy_idle_get_auto_away@Base 0.21.91 + empathy_idle_get_flash_state@Base 0.21.91 + empathy_idle_get_state@Base 0.21.91 + empathy_idle_get_status@Base 0.21.91 + empathy_idle_get_type@Base 0.21.91 + empathy_idle_get_use_nm@Base 0.21.91 + empathy_idle_set_auto_away@Base 0.21.91 + empathy_idle_set_flash_state@Base 0.21.91 + empathy_idle_set_presence@Base 0.21.91 + empathy_idle_set_state@Base 0.21.91 + empathy_idle_set_status@Base 0.21.91 + empathy_idle_set_use_nm@Base 0.21.91 + empathy_init@Base 2.25.3 + empathy_irc_network_append_server@Base 0.21.91 + empathy_irc_network_get_servers@Base 0.21.91 + empathy_irc_network_get_type@Base 0.21.91 + empathy_irc_network_manager_add@Base 0.21.91 + empathy_irc_network_manager_find_network_by_address@Base 0.21.91 + empathy_irc_network_manager_get_networks@Base 0.21.91 + empathy_irc_network_manager_get_type@Base 0.21.91 + empathy_irc_network_manager_new@Base 0.21.91 + empathy_irc_network_manager_remove@Base 0.21.91 + empathy_irc_network_new@Base 0.21.91 + empathy_irc_network_remove_server@Base 0.21.91 + empathy_irc_network_set_server_position@Base 0.21.91 + empathy_irc_server_get_type@Base 0.21.91 + empathy_irc_server_new@Base 0.21.91 + empathy_log_manager_add_message@Base 0.21.91 + empathy_log_manager_dup_singleton@Base 2.25.91 + empathy_log_manager_exists@Base 0.21.91 + empathy_log_manager_get_chats@Base 0.21.91 + empathy_log_manager_get_date_readable@Base 0.21.91 + empathy_log_manager_get_dates@Base 0.21.91 + empathy_log_manager_get_filtered_messages@Base 2.26.0 + empathy_log_manager_get_messages_for_date@Base 0.21.91 + empathy_log_manager_get_type@Base 0.21.91 + empathy_log_manager_observe@Base 2.26.0 + empathy_log_manager_search_free@Base 0.21.91 + empathy_log_manager_search_hit_free@Base 2.26.0 + empathy_log_manager_search_new@Base 0.21.91 + empathy_log_store_ack_message@Base 2.26.0 + empathy_log_store_add_message@Base 2.26.0 + empathy_log_store_empathy_get_type@Base 2.26.0 + empathy_log_store_exists@Base 2.26.0 + empathy_log_store_get_chats@Base 2.26.0 + empathy_log_store_get_dates@Base 2.26.0 + empathy_log_store_get_filtered_messages@Base 2.26.0 + empathy_log_store_get_last_messages@Base 2.26.0 + empathy_log_store_get_messages_for_date@Base 2.26.0 + empathy_log_store_get_name@Base 2.26.0 + empathy_log_store_get_type@Base 2.26.0 + empathy_log_store_search_new@Base 2.26.0 + empathy_message_equal@Base 2.26.0 + empathy_message_get_body@Base 0.21.91 + empathy_message_get_id@Base 2.25.91 + empathy_message_get_receiver@Base 0.21.91 + empathy_message_get_sender@Base 0.21.91 + empathy_message_get_timestamp@Base 0.21.91 + empathy_message_get_tptype@Base 0.23.2 + empathy_message_get_type@Base 0.21.91 + empathy_message_new@Base 0.21.91 + empathy_message_set_body@Base 0.21.91 + empathy_message_set_id@Base 2.25.91 + empathy_message_set_receiver@Base 0.21.91 + empathy_message_set_sender@Base 0.21.91 + empathy_message_set_timestamp@Base 0.21.91 + empathy_message_set_tptype@Base 0.23.2 + empathy_message_should_highlight@Base 0.23.1 + empathy_message_type_from_str@Base 0.21.91 + empathy_message_type_to_str@Base 0.21.91 + empathy_mission_control_dup_singleton@Base 2.25.91 + empathy_presence_from_str@Base 0.21.91 + empathy_presence_get_default_message@Base 0.21.91 + empathy_presence_to_str@Base 0.21.91 + empathy_proxy_equal@Base 0.23.3 + empathy_proxy_hash@Base 0.23.3 + empathy_status_presets_clear_default@Base 0.21.91 + empathy_status_presets_get@Base 0.21.91 + empathy_status_presets_get_all@Base 0.21.91 + empathy_status_presets_get_default_state@Base 0.21.91 + empathy_status_presets_get_default_status@Base 0.21.91 + empathy_status_presets_remove@Base 0.21.91 + empathy_status_presets_reset@Base 0.21.91 + empathy_status_presets_set_default@Base 0.21.91 + empathy_status_presets_set_last@Base 0.21.91 + empathy_strcasecmp@Base 0.21.91 + empathy_strncasecmp@Base 0.21.91 + empathy_substring@Base 0.21.91 + empathy_time_get_current@Base 0.21.91 + empathy_time_get_local_time@Base 0.21.91 + empathy_time_parse@Base 0.21.91 + empathy_time_to_string_local@Base 0.21.91 + empathy_time_to_string_relative@Base 2.27.3 + empathy_time_to_string_utc@Base 0.21.91 + empathy_tp_call_accept_incoming_call@Base 0.21.91 + empathy_tp_call_close@Base 2.25.91 + empathy_tp_call_get_type@Base 0.21.91 + empathy_tp_call_has_dtmf@Base 0.23.4 + empathy_tp_call_is_receiving_video@Base 2.27.3 + empathy_tp_call_is_sending_video@Base 2.27.3 + empathy_tp_call_new@Base 0.21.91 + empathy_tp_call_request_video_stream_direction@Base 2.25.91 + empathy_tp_call_start_tone@Base 0.23.2 + empathy_tp_call_status_get_type@Base 0.21.91 + empathy_tp_call_stop_tone@Base 0.23.2 + empathy_tp_call_to@Base 2.25.91 + empathy_tp_chat_acknowledge_message@Base 2.25.91 + empathy_tp_chat_acknowledge_messages@Base 2.25.91 + empathy_tp_chat_close@Base 2.25.91 + empathy_tp_chat_get_channel@Base 0.23.2 + empathy_tp_chat_get_connection@Base 2.27.1.1 + empathy_tp_chat_get_id@Base 0.21.91 + empathy_tp_chat_get_pending_messages@Base 2.25.91 + empathy_tp_chat_get_remote_contact@Base 0.23.1 + empathy_tp_chat_get_type@Base 0.21.91 + empathy_tp_chat_is_ready@Base 0.23.1 + empathy_tp_chat_new@Base 0.21.91 + empathy_tp_chat_send@Base 0.21.91 + empathy_tp_chat_set_property@Base 0.23.1 + empathy_tp_chat_set_state@Base 0.21.91 + empathy_tp_contact_factory_dup_singleton@Base 2.27.1.1 + empathy_tp_contact_factory_get_from_handle@Base 0.21.91 + empathy_tp_contact_factory_get_from_handles@Base 0.21.91 + empathy_tp_contact_factory_get_from_id@Base 0.21.91 + empathy_tp_contact_factory_get_from_ids@Base 2.27.1.1 + empathy_tp_contact_factory_get_type@Base 0.21.91 + empathy_tp_contact_factory_set_alias@Base 0.21.91 + empathy_tp_contact_factory_set_avatar@Base 0.21.91 + empathy_tp_contact_factory_set_location@Base 2.27.1.1 + empathy_tp_contact_list_can_add@Base 2.25.3 + empathy_tp_contact_list_get_connection@Base 2.27.1.1 + empathy_tp_contact_list_get_type@Base 0.21.91 + empathy_tp_contact_list_new@Base 0.21.91 + empathy_tp_contact_list_remove_all@Base 2.27.1.1 + empathy_tp_file_accept@Base 2.25.2 + empathy_tp_file_cancel@Base 2.25.2 + empathy_tp_file_close@Base 2.27.3 + empathy_tp_file_get_type@Base 2.25.2 + empathy_tp_file_is_incoming@Base 2.25.2 + empathy_tp_file_new@Base 2.25.2 + empathy_tp_file_offer@Base 2.25.2 + empathy_tp_roomlist_get_type@Base 0.21.91 + empathy_tp_roomlist_is_listing@Base 0.21.91 + empathy_tp_roomlist_new@Base 0.21.91 + empathy_tp_roomlist_start@Base 0.21.91 + empathy_tp_roomlist_stop@Base 0.21.91 + empathy_tube_handler_build_bus_name@Base 0.23.1 + empathy_tube_handler_build_object_path@Base 0.23.1 + empathy_tube_handler_get_type@Base 0.23.1 + empathy_tube_handler_new@Base 0.23.1 + empathy_uint_compare@Base 2.27.3 + empathy_xml_node_find_child_prop_value@Base 0.21.91 + empathy_xml_node_get_child@Base 0.21.91 + empathy_xml_node_get_child_content@Base 0.21.91 + empathy_xml_validate@Base 0.21.91 --- empathy-2.27.3.orig/debian/patches/099_autoreconf.patch +++ empathy-2.27.3/debian/patches/099_autoreconf.patch @@ -0,0 +1,776 @@ +diff --git a/Makefile.in b/Makefile.in +index 0e542ef..f224e37 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -148,6 +148,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/config.h.in b/config.h.in +index 9d2d48b..ab5071d 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -36,6 +36,9 @@ + /* Define if you have libchamplain */ + #undef HAVE_LIBCHAMPLAIN + ++/* Define if you have libindicate */ ++#undef HAVE_LIBINDICATE ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_LOCALE_H + +diff --git a/configure b/configure +index e4fadf0..d3c4774 100755 +--- a/configure ++++ b/configure +@@ -813,6 +813,10 @@ HAVE_TESTS_FALSE + HAVE_TESTS_TRUE + CHECK_LIBS + CHECK_CFLAGS ++HAVE_LIBINDICATE_FALSE ++HAVE_LIBINDICATE_TRUE ++INDICATE_LIBS ++INDICATE_CFLAGS + HAVE_NOTHERE_FALSE + HAVE_NOTHERE_TRUE + NOTHERE_LIBS +@@ -1081,6 +1085,7 @@ enable_map + enable_location + enable_megaphone + enable_nothere ++enable_libindicate + enable_tests + enable_python + enable_coding_style_checks +@@ -1119,6 +1124,8 @@ MEGAPHONE_CFLAGS + MEGAPHONE_LIBS + NOTHERE_CFLAGS + NOTHERE_LIBS ++INDICATE_CFLAGS ++INDICATE_LIBS + CHECK_CFLAGS + CHECK_LIBS + PYTHON_BINDING_CFLAGS +@@ -1785,6 +1792,8 @@ Optional Features: + build megaphone applet + --enable-nothere=[no/yes/auto] + build nothere applet ++ --enable-libindicate=[no/yes/auto] ++ build libindicate support + --enable-tests=[no/yes/auto] + build tests + --enable-python=[no/yes/auto] +@@ -1867,6 +1876,10 @@ Some influential environment variables: + C compiler flags for NOTHERE, overriding pkg-config + NOTHERE_LIBS + linker flags for NOTHERE, overriding pkg-config ++ INDICATE_CFLAGS ++ C compiler flags for INDICATE, overriding pkg-config ++ INDICATE_LIBS ++ linker flags for INDICATE, overriding pkg-config + CHECK_CFLAGS + C compiler flags for CHECK, overriding pkg-config + CHECK_LIBS linker flags for CHECK, overriding pkg-config +@@ -6002,13 +6015,13 @@ if test "${lt_cv_nm_interface+set}" = set; then + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6005: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6018: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6008: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6021: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6011: output\"" >&5) ++ (eval echo "\"\$as_me:6024: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7213,7 +7226,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7216 "configure"' > conftest.$ac_ext ++ echo '#line 7229 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8655,11 +8668,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8658: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8671: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8662: \$? = $ac_status" >&5 ++ echo "$as_me:8675: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8994,11 +9007,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8997: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9010: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9001: \$? = $ac_status" >&5 ++ echo "$as_me:9014: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9099,11 +9112,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9102: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9115: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9106: \$? = $ac_status" >&5 ++ echo "$as_me:9119: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9154,11 +9167,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9157: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9170: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9161: \$? = $ac_status" >&5 ++ echo "$as_me:9174: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11967,7 +11980,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11970 "configure" ++#line 11983 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12063,7 +12076,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12066 "configure" ++#line 12079 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -18922,6 +18935,132 @@ fi + + + # ----------------------------------------------------------- ++# libindicate ++# ----------------------------------------------------------- ++# Check whether --enable-libindicate was given. ++if test "${enable_libindicate+set}" = set; then ++ enableval=$enable_libindicate; ++else ++ enable_libindicate=auto ++fi ++ ++ ++if test "x$enable_libindicate" != "xno"; then ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for INDICATE" >&5 ++$as_echo_n "checking for INDICATE... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$INDICATE_CFLAGS"; then ++ pkg_cv_INDICATE_CFLAGS="$INDICATE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ indicate ++ \"") >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ indicate ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_INDICATE_CFLAGS=`$PKG_CONFIG --cflags " ++ indicate ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$INDICATE_LIBS"; then ++ pkg_cv_INDICATE_LIBS="$INDICATE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" ++ indicate ++ \"") >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ indicate ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_INDICATE_LIBS=`$PKG_CONFIG --libs " ++ indicate ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ INDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ++ indicate ++ "` ++ else ++ INDICATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ++ indicate ++ "` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$INDICATE_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ have_libindicate="no" ++elif test $pkg_failed = untried; then ++ have_libindicate="no" ++else ++ INDICATE_CFLAGS=$pkg_cv_INDICATE_CFLAGS ++ INDICATE_LIBS=$pkg_cv_INDICATE_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_libindicate="yes" ++fi ++else ++ have_libindicate=no ++fi ++ ++if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then ++ { { $as_echo "$as_me:$LINENO: error: Couldn't find libindicate." >&5 ++$as_echo "$as_me: error: Couldn't find libindicate." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++if test "x$enable_libindicate" = "xyes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBINDICATE 1 ++_ACEOF ++ ++fi ++ ++ if test "x$have_libindicate" = "xyes"; then ++ HAVE_LIBINDICATE_TRUE= ++ HAVE_LIBINDICATE_FALSE='#' ++else ++ HAVE_LIBINDICATE_TRUE='#' ++ HAVE_LIBINDICATE_FALSE= ++fi ++ ++ ++# ----------------------------------------------------------- + # Tests + # ----------------------------------------------------------- + # Check whether --enable-tests was given. +@@ -19647,6 +19786,13 @@ $as_echo "$as_me: error: conditional \"HAVE_NOTHERE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${HAVE_LIBINDICATE_TRUE}" && test -z "${HAVE_LIBINDICATE_FALSE}"; then ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBINDICATE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"HAVE_LIBINDICATE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${HAVE_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -21955,22 +22101,23 @@ fi + echo " + Configure summary: + +- Compiler....................: ${CC} +- Compiler Flags..............: ${CFLAGS} +- Prefix......................: ${prefix} +- Shaved build................: ${enable_shave} +- Tests.......................: ${have_check} +- Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} ++ Compiler...............................: ${CC} ++ Compiler Flags.........................: ${CFLAGS} ++ Prefix.................................: ${prefix} ++ Shaved build...........................: ${enable_shave} ++ Tests..................................: ${have_check} ++ Coding style checks....................: ${ENABLE_CODING_STYLE_CHECKS} + + Features: +- Spell checking (enchant)....: ${have_enchant} +- Display maps (libchamplain).: ${have_libchamplain} +- Location awareness (Geoclue): ${have_geoclue} +- Adium themes (Webkit).......: ${have_webkit} ++ Spell checking (enchant)...............: ${have_enchant} ++ Display maps (libchamplain)............: ${have_libchamplain} ++ Location awareness (Geoclue)...........: ${have_geoclue} ++ Adium themes (Webkit)..................: ${have_webkit} ++ Message indicator support (libindicate): ${have_libindicate} + + Extras: +- Documentation...............: ${enable_gtk_doc} +- Python bindings.............: ${have_python} +- Megaphone applet............: ${have_megaphone} +- Nothere applet..............: ${have_nothere} ++ Documentation..........................: ${enable_gtk_doc} ++ Python bindings........................: ${have_python} ++ Megaphone applet.......................: ${have_megaphone} ++ Nothere applet.........................: ${have_nothere} + " +diff --git a/data/Makefile.in b/data/Makefile.in +index c2135f4..749f9bf 100644 +--- a/data/Makefile.in ++++ b/data/Makefile.in +@@ -138,6 +138,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in +index c18c021..8ab59b7 100644 +--- a/data/icons/Makefile.in ++++ b/data/icons/Makefile.in +@@ -111,6 +111,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/docs/Makefile.in b/docs/Makefile.in +index cc696b4..68a3549 100644 +--- a/docs/Makefile.in ++++ b/docs/Makefile.in +@@ -123,6 +123,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/docs/libempathy-gtk/Makefile.in b/docs/libempathy-gtk/Makefile.in +index 84a9a5f..da9d64c 100644 +--- a/docs/libempathy-gtk/Makefile.in ++++ b/docs/libempathy-gtk/Makefile.in +@@ -118,6 +118,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/docs/libempathy/Makefile.in b/docs/libempathy/Makefile.in +index 1e448c0..b6fe703 100644 +--- a/docs/libempathy/Makefile.in ++++ b/docs/libempathy/Makefile.in +@@ -118,6 +118,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/extensions/Makefile.in b/extensions/Makefile.in +index 9328c37..6351b27 100644 +--- a/extensions/Makefile.in ++++ b/extensions/Makefile.in +@@ -134,6 +134,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/help/Makefile.in b/help/Makefile.in +index 3f79e68..1c37e3d 100644 +--- a/help/Makefile.in ++++ b/help/Makefile.in +@@ -136,6 +136,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/libempathy-gtk/Makefile.in b/libempathy-gtk/Makefile.in +index 7479da8..4dcaaed 100644 +--- a/libempathy-gtk/Makefile.in ++++ b/libempathy-gtk/Makefile.in +@@ -242,6 +242,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/libempathy/Makefile.in b/libempathy/Makefile.in +index a22c9e4..01fe8f4 100644 +--- a/libempathy/Makefile.in ++++ b/libempathy/Makefile.in +@@ -178,6 +178,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/megaphone/Makefile.in b/megaphone/Makefile.in +index 3027237..332a5a3 100644 +--- a/megaphone/Makefile.in ++++ b/megaphone/Makefile.in +@@ -123,6 +123,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/megaphone/data/Makefile.in b/megaphone/data/Makefile.in +index 890b5f2..e97908e 100644 +--- a/megaphone/data/Makefile.in ++++ b/megaphone/data/Makefile.in +@@ -125,6 +125,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/megaphone/src/Makefile.in b/megaphone/src/Makefile.in +index a29c8c8..0b8aec0 100644 +--- a/megaphone/src/Makefile.in ++++ b/megaphone/src/Makefile.in +@@ -138,6 +138,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/nothere/Makefile.in b/nothere/Makefile.in +index 15bae7a..9233970 100644 +--- a/nothere/Makefile.in ++++ b/nothere/Makefile.in +@@ -123,6 +123,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/nothere/data/Makefile.in b/nothere/data/Makefile.in +index ed2f0ad..0523502 100644 +--- a/nothere/data/Makefile.in ++++ b/nothere/data/Makefile.in +@@ -123,6 +123,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/nothere/src/Makefile.in b/nothere/src/Makefile.in +index 00383bb..5dc574a 100644 +--- a/nothere/src/Makefile.in ++++ b/nothere/src/Makefile.in +@@ -138,6 +138,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/python/Makefile.in b/python/Makefile.in +index 006ead8..06f109e 100644 +--- a/python/Makefile.in ++++ b/python/Makefile.in +@@ -123,6 +123,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/python/pyempathy/Makefile.in b/python/pyempathy/Makefile.in +index 7c9b111..f3a4708 100644 +--- a/python/pyempathy/Makefile.in ++++ b/python/pyempathy/Makefile.in +@@ -146,6 +146,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/python/pyempathygtk/Makefile.in b/python/pyempathygtk/Makefile.in +index 6f204af..4c492dc 100644 +--- a/python/pyempathygtk/Makefile.in ++++ b/python/pyempathygtk/Makefile.in +@@ -147,6 +147,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/src/Makefile.in b/src/Makefile.in +index d52f594..c9dd9ab 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -38,14 +38,24 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(top_srcdir)/tools/check-coding-style.mk \ + $(top_srcdir)/tools/flymake.mk $(top_srcdir)/tools/shave.mk + bin_PROGRAMS = empathy$(EXEEXT) empathy-logs$(EXEEXT) +-@HAVE_LIBCHAMPLAIN_TRUE@am__append_1 = \ ++@HAVE_LIBINDICATE_TRUE@am__append_1 = \ ++@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.c \ ++@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.h \ ++@HAVE_LIBINDICATE_TRUE@ empathy-indicator.c empathy-indicator.h ++ ++@HAVE_LIBINDICATE_FALSE@am__append_2 = \ ++@HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.c \ ++@HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.h \ ++@HAVE_LIBINDICATE_FALSE@ empathy-indicator.c empathy-indicator.h ++ ++@HAVE_LIBCHAMPLAIN_TRUE@am__append_3 = \ + @HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.c \ + @HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.h + +-@HAVE_LIBCHAMPLAIN_TRUE@am__append_2 = \ ++@HAVE_LIBCHAMPLAIN_TRUE@am__append_4 = \ + @HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.ui + +-@HAVE_LIBCHAMPLAIN_FALSE@am__append_3 = \ ++@HAVE_LIBCHAMPLAIN_FALSE@am__append_5 = \ + @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.c \ + @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.h \ + @HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.ui +@@ -88,8 +98,9 @@ am__empathy_SOURCES_DIST = empathy.c empathy-about-dialog.c \ + empathy-sidebar.h empathy-status-icon.c empathy-status-icon.h \ + empathy-tube-dispatch.c empathy-tube-dispatch.h \ + bacon-message-connection.c bacon-message-connection.h \ +- ephy-spinner.c ephy-spinner.h empathy-map-view.c \ +- empathy-map-view.h ++ ephy-spinner.c ephy-spinner.h empathy-indicator-manager.c \ ++ empathy-indicator-manager.h empathy-indicator.c \ ++ empathy-indicator.h empathy-map-view.c empathy-map-view.h + am__objects_1 = empathy.$(OBJEXT) empathy-about-dialog.$(OBJEXT) \ + empathy-accounts-dialog.$(OBJEXT) \ + empathy-call-window.$(OBJEXT) \ +@@ -102,12 +113,15 @@ am__objects_1 = empathy.$(OBJEXT) empathy-about-dialog.$(OBJEXT) \ + empathy-misc.$(OBJEXT) empathy-new-chatroom-dialog.$(OBJEXT) \ + empathy-preferences.$(OBJEXT) empathy-sidebar.$(OBJEXT) \ + empathy-status-icon.$(OBJEXT) empathy-tube-dispatch.$(OBJEXT) +-@HAVE_LIBCHAMPLAIN_TRUE@am__objects_2 = empathy-map-view.$(OBJEXT) ++@HAVE_LIBINDICATE_TRUE@am__objects_2 = \ ++@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.$(OBJEXT) \ ++@HAVE_LIBINDICATE_TRUE@ empathy-indicator.$(OBJEXT) ++@HAVE_LIBCHAMPLAIN_TRUE@am__objects_3 = empathy-map-view.$(OBJEXT) + am_empathy_OBJECTS = $(am__objects_1) \ + bacon-message-connection.$(OBJEXT) ephy-spinner.$(OBJEXT) \ +- $(am__objects_2) +-am__objects_3 = empathy-tube-dispatch-enumtypes.$(OBJEXT) +-nodist_empathy_OBJECTS = $(am__objects_3) ++ $(am__objects_2) $(am__objects_3) ++am__objects_4 = empathy-tube-dispatch-enumtypes.$(OBJEXT) ++nodist_empathy_OBJECTS = $(am__objects_4) + empathy_OBJECTS = $(am_empathy_OBJECTS) $(nodist_empathy_OBJECTS) + empathy_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +@@ -116,7 +130,8 @@ empathy_DEPENDENCIES = \ + $(top_builddir)/libempathy/libempathy.la \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + am_empathy_logs_OBJECTS = empathy-logs.$(OBJEXT) + empathy_logs_OBJECTS = $(am_empathy_logs_OBJECTS) + empathy_logs_LDADD = $(LDADD) +@@ -125,7 +140,8 @@ empathy_logs_DEPENDENCIES = \ + $(top_builddir)/libempathy/libempathy.la \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -215,6 +231,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -373,6 +391,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(EMPATHY_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ ++ $(INDICATE_CFLAGS) \ + $(LIBCHAMPLAIN_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WEBKIT_CFLAGS) \ +@@ -383,6 +402,7 @@ LDADD = \ + $(top_builddir)/libempathy/libempathy.la \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(LIBNOTIFY_LIBS) \ ++ $(INDICATE_LIBS) \ + $(EMPATHY_LIBS) \ + $(LIBCHAMPLAIN_LIBS) \ + $(WEBKIT_LIBS) +@@ -414,7 +434,7 @@ empathy_handwritten_source = \ + + empathy_SOURCES = $(empathy_handwritten_source) \ + bacon-message-connection.c bacon-message-connection.h \ +- ephy-spinner.c ephy-spinner.h $(am__append_1) ++ ephy-spinner.c ephy-spinner.h $(am__append_1) $(am__append_3) + nodist_empathy_SOURCES = $(BUILT_SOURCES) + empathy_logs_SOURCES = empathy-logs.c + check_c_sources = \ +@@ -427,8 +447,9 @@ ui_DATA = empathy-accounts-dialog.ui empathy-call-window.ui \ + empathy-chat-window.ui empathy-ft-manager.ui \ + empathy-import-dialog.ui empathy-main-window.ui \ + empathy-new-chatroom-dialog.ui empathy-preferences.ui \ +- empathy-status-icon.ui $(am__append_2) +-EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_3) ++ empathy-status-icon.ui $(am__append_4) ++EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_2) \ ++ $(am__append_5) + dist_man_MANS = \ + empathy.1 + +@@ -520,6 +541,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-ft-manager.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-dialog.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-pidgin.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator-manager.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-logs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-main-window.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-map-view.Po@am__quote@ +diff --git a/tests/Makefile.in b/tests/Makefile.in +index c9f930d..00f4a8b 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -205,6 +205,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/tests/xml/Makefile.in b/tests/xml/Makefile.in +index 9b84427..b05b689 100644 +--- a/tests/xml/Makefile.in ++++ b/tests/xml/Makefile.in +@@ -111,6 +111,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 7951862..dd9b4fc 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -114,6 +114,8 @@ GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ --- empathy-2.27.3.orig/debian/patches/001_add_indicator.patch +++ empathy-2.27.3/debian/patches/001_add_indicator.patch @@ -0,0 +1,1341 @@ +commit 553fa2427fa0c568aff9d726f0c89cd70dcae54e +Author: Ken VanDine +Date: Mon Jun 15 14:49:31 2009 -0400 + + add indicator support + +diff --git a/configure.ac b/configure.ac +index ce87cb8..f6b1d4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -334,6 +334,33 @@ fi + AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes") + + # ----------------------------------------------------------- ++# libindicate ++# ----------------------------------------------------------- ++AC_ARG_ENABLE(libindicate, ++ AS_HELP_STRING([--enable-libindicate=@<:@no/yes/auto@:>@], ++ [build libindicate support]), , ++ enable_libindicate=auto) ++ ++if test "x$enable_libindicate" != "xno"; then ++ PKG_CHECK_MODULES(INDICATE, ++ [ ++ indicate ++ ], have_libindicate="yes", have_libindicate="no") ++else ++ have_libindicate=no ++fi ++ ++if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then ++ AC_MSG_ERROR([Couldn't find libindicate.]) ++fi ++ ++if test "x$enable_libindicate" = "xyes"; then ++ AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if you have libindicate]) ++fi ++ ++AM_CONDITIONAL(HAVE_LIBINDICATE, test "x$have_libindicate" = "xyes") ++ ++# ----------------------------------------------------------- + # Tests + # ----------------------------------------------------------- + AC_ARG_ENABLE(tests, +@@ -442,22 +469,23 @@ AC_OUTPUT([ + echo " + Configure summary: + +- Compiler....................: ${CC} +- Compiler Flags..............: ${CFLAGS} +- Prefix......................: ${prefix} +- Shaved build................: ${enable_shave} +- Tests.......................: ${have_check} +- Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} ++ Compiler...............................: ${CC} ++ Compiler Flags.........................: ${CFLAGS} ++ Prefix.................................: ${prefix} ++ Shaved build...........................: ${enable_shave} ++ Tests..................................: ${have_check} ++ Coding style checks....................: ${ENABLE_CODING_STYLE_CHECKS} + + Features: +- Spell checking (enchant)....: ${have_enchant} +- Display maps (libchamplain).: ${have_libchamplain} +- Location awareness (Geoclue): ${have_geoclue} +- Adium themes (Webkit).......: ${have_webkit} ++ Spell checking (enchant)...............: ${have_enchant} ++ Display maps (libchamplain)............: ${have_libchamplain} ++ Location awareness (Geoclue)...........: ${have_geoclue} ++ Adium themes (Webkit)..................: ${have_webkit} ++ Message indicator support (libindicate): ${have_libindicate} + + Extras: +- Documentation...............: ${enable_gtk_doc} +- Python bindings.............: ${have_python} +- Megaphone applet............: ${have_megaphone} +- Nothere applet..............: ${have_nothere} ++ Documentation..........................: ${enable_gtk_doc} ++ Python bindings........................: ${have_python} ++ Megaphone applet.......................: ${have_megaphone} ++ Nothere applet.........................: ${have_nothere} + " +diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in +index 81ea5e8..5bf7369 100644 +--- a/data/empathy.schemas.in ++++ b/data/empathy.schemas.in +@@ -261,6 +261,21 @@ + + + ++ /schemas/apps/empathy/notifications/use_libindicate ++ /apps/empathy/notifications/use_libindicate ++ empathy ++ bool ++ true ++ ++ Use the messaging indicator ++ ++ Whether or not to use the messaging indicator, if false ++ the icon in the notification area will be displayed. ++ ++ ++ ++ ++ + /schemas/apps/empathy/ui/separate_chat_windows + /apps/empathy/ui/separate_chat_windows + empathy +diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h +index 4794913..2eeef25 100644 +--- a/libempathy-gtk/empathy-conf.h ++++ b/libempathy-gtk/empathy-conf.h +@@ -70,6 +70,7 @@ struct _EmpathyConfClass { + #define EMPATHY_PREFS_UI_AVATAR_DIRECTORY EMPATHY_PREFS_PATH "/ui/avatar_directory" + #define EMPATHY_PREFS_UI_SHOW_AVATARS EMPATHY_PREFS_PATH "/ui/show_avatars" + #define EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST EMPATHY_PREFS_PATH "/ui/compact_contact_list" ++#define EMPATHY_PREFS_UI_USE_LIBINDICATE EMPATHY_PREFS_PATH "/notifications/use_libindicate" + #define EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE EMPATHY_PREFS_PATH "/contacts/show_offline" + #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM EMPATHY_PREFS_PATH "/contacts/sort_criterium" + #define EMPATHY_PREFS_HINTS_CLOSE_MAIN_WINDOW EMPATHY_PREFS_PATH "/hints/close_main_window" +diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c +index cf423de..1234f44 100644 +--- a/libempathy-gtk/empathy-ui-utils.c ++++ b/libempathy-gtk/empathy-ui-utils.c +@@ -1272,24 +1272,30 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon) + Display *dpy; + GdkWindow *gdk_window; + +- gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL); +- gdk_window = GTK_WIDGET (window)->window; +- dpy = gdk_x11_drawable_get_xdisplay (gdk_window); +- +- data[0] = icon_location.x; +- data[1] = icon_location.y; +- data[2] = icon_location.width; +- data[3] = icon_location.height; +- +- XChangeProperty (dpy, +- GDK_WINDOW_XID (gdk_window), +- gdk_x11_get_xatom_by_name_for_display (gdk_drawable_get_display (gdk_window), +- "_NET_WM_ICON_GEOMETRY"), +- XA_CARDINAL, 32, PropModeReplace, +- (guchar *)&data, 4); ++ if (gtk_status_icon_get_visible (status_icon)) { ++ gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL); ++ gdk_window = GTK_WIDGET (window)->window; ++ dpy = gdk_x11_drawable_get_xdisplay (gdk_window); ++ ++ data[0] = icon_location.x; ++ data[1] = icon_location.y; ++ data[2] = icon_location.width; ++ data[3] = icon_location.height; ++ ++ XChangeProperty (dpy, ++ GDK_WINDOW_XID (gdk_window), ++ gdk_x11_get_xatom_by_name_for_display (gdk_drawable_get_display (gdk_window), ++ "_NET_WM_ICON_GEOMETRY"), ++ XA_CARDINAL, 32, PropModeReplace, ++ (guchar *)&data, 4); ++ } + + gtk_window_set_skip_taskbar_hint (window, TRUE); +- gtk_window_iconify (window); ++ if (gtk_status_icon_get_visible (status_icon)) { ++ gtk_window_iconify (window); ++ } else { ++ gtk_widget_hide (GTK_WIDGET(window)); ++ } + } + + /* Takes care of moving the window to the current workspace. */ +diff --git a/src/Makefile.am b/src/Makefile.am +index dbcd6d4..cb28933 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -5,6 +5,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir) \ + $(EMPATHY_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ ++ $(INDICATE_CFLAGS) \ + $(LIBCHAMPLAIN_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WEBKIT_CFLAGS) \ +@@ -15,6 +16,7 @@ LDADD = \ + $(top_builddir)/libempathy/libempathy.la \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(LIBNOTIFY_LIBS) \ ++ $(INDICATE_LIBS) \ + $(EMPATHY_LIBS) \ + $(LIBCHAMPLAIN_LIBS) \ + $(WEBKIT_LIBS) +@@ -77,10 +79,22 @@ ui_DATA = \ + empathy-preferences.ui \ + empathy-status-icon.ui + +-EXTRA_DIST = \ +- $(autostart_DATA) \ ++EXTRA_DIST = \ ++ $(autostart_DATA) \ + $(ui_DATA) + ++if HAVE_LIBINDICATE ++empathy_SOURCES += \ ++ empathy-indicator-manager.c \ ++ empathy-indicator-manager.h \ ++ empathy-indicator.c empathy-indicator.h ++else ++EXTRA_DIST += \ ++ empathy-indicator-manager.c \ ++ empathy-indicator-manager.h \ ++ empathy-indicator.c empathy-indicator.h ++endif ++ + if HAVE_LIBCHAMPLAIN + empathy_SOURCES += \ + empathy-map-view.c \ +diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c +index 9c2dbc4..0f294c3 100644 +--- a/src/empathy-chat-window.c ++++ b/src/empathy-chat-window.c +@@ -56,6 +56,11 @@ + #include "empathy-about-dialog.h" + #include "empathy-misc.h" + ++#ifdef HAVE_LIBINDICATE ++#include "empathy-indicator.h" ++#include "empathy-indicator-manager.h" ++#endif ++ + #define DEBUG_FLAG EMPATHY_DEBUG_CHAT + #include + +@@ -72,6 +77,10 @@ typedef struct { + GtkWidget *dialog; + GtkWidget *notebook; + NotifyNotification *notification; ++#ifdef HAVE_LIBINDICATE ++ EmpathyIndicatorManager *indicator_manager; ++ GHashTable *indicators; ++#endif + + /* Menu items. */ + GtkUIManager *ui_manager; +@@ -904,6 +913,77 @@ chat_window_notification_closed_cb (NotifyNotification *notify, + g_slice_free (NotificationData, cb_data); + } + ++#ifdef HAVE_LIBINDICATE ++static void ++chat_window_indicator_activate_cb (EmpathyIndicator *indicator, ++ NotificationData *cb_data) ++{ ++ empathy_chat_window_present_chat (cb_data->chat); ++ ++ empathy_indicator_hide (indicator); ++ g_object_unref (indicator); ++ g_object_unref (cb_data->chat); ++ g_slice_free (NotificationData, cb_data); ++} ++ ++static void ++chat_window_add_indicator (EmpathyChatWindow *window, ++ EmpathyMessage *message, ++ EmpathyChat *chat) ++{ ++ EmpathyChatWindowPriv *priv = GET_PRIV (window); ++ EmpathyContact *sender; ++ const char *body; ++ NotificationData *cb_data; ++ gboolean use_libindicate; ++ EmpathyIndicator *indicator; ++ ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_UI_USE_LIBINDICATE, ++ &use_libindicate); ++ ++ if (!use_libindicate) { ++ return; ++ } ++ ++ cb_data = g_slice_new0 (NotificationData); ++ cb_data->chat = g_object_ref (chat); ++ cb_data->window = window; ++ ++ sender = empathy_message_get_sender (message); ++ body = empathy_message_get_body (message); ++ ++ indicator = g_hash_table_lookup (priv->indicators, chat); ++ if (indicator) { ++ empathy_indicator_update (indicator, body); ++ } else { ++ indicator = empathy_indicator_manager_add_indicator (priv->indicator_manager, ++ sender, body); ++ g_signal_connect (indicator, "activate", ++ G_CALLBACK (chat_window_indicator_activate_cb), cb_data); ++ g_hash_table_insert(priv->indicators, chat, g_object_ref(indicator)); ++ } ++ empathy_indicator_show (indicator); ++} ++ ++static void ++chat_window_remove_indicator (EmpathyChatWindow *window, EmpathyChat *chat) ++{ ++ EmpathyIndicator *indicator; ++ EmpathyChatWindowPriv *priv = GET_PRIV (window); ++ ++ indicator = g_hash_table_lookup (priv->indicators, chat); ++ ++ if (!indicator) { ++ return; ++ } ++ ++ empathy_indicator_hide (indicator); ++ g_hash_table_remove (priv->indicators, chat); ++ g_object_unref (indicator); ++} ++#endif ++ + static void + chat_window_show_or_update_notification (EmpathyChatWindow *window, + EmpathyMessage *message, +@@ -1010,6 +1090,9 @@ chat_window_new_message_cb (EmpathyChat *chat, + empathy_sound_play (GTK_WIDGET (priv->dialog), + EMPATHY_SOUND_MESSAGE_INCOMING); + chat_window_show_or_update_notification (window, message, chat); ++#ifdef HAVE_LIBINDICATE ++ chat_window_add_indicator (window, message, chat); ++#endif + } + + if (!g_list_find (priv->chats_new_msg, chat)) { +@@ -1074,6 +1157,10 @@ chat_window_page_switched_cb (GtkNotebook *notebook, + priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat); + + chat_window_update_chat_tab (chat); ++ ++#ifdef HAVE_LIBINDICATE ++ chat_window_remove_indicator (window, chat); ++#endif + } + + static void +@@ -1184,6 +1271,11 @@ chat_window_focus_in_event_cb (GtkWidget *widget, + /* Update the title, since we now mark all unread messages as read. */ + chat_window_update_chat_tab (priv->current_chat); + ++#ifdef HAVE_LIBINDICATE ++ /* Remove the indicator for the active chat */ ++ chat_window_remove_indicator (window, priv->current_chat); ++#endif ++ + return FALSE; + } + +@@ -1401,6 +1493,10 @@ empathy_chat_window_init (EmpathyChatWindow *window) + g_object_unref (gui); + + priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); ++#ifdef HAVE_LIBINDICATE ++ priv->indicator_manager = empathy_indicator_manager_dup_singleton (); ++ priv->indicators = g_hash_table_new (NULL, NULL); ++#endif + + priv->notebook = gtk_notebook_new (); + gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); + +diff --git a/src/empathy-indicator-manager.c b/src/empathy-indicator-manager.c +new file mode 100644 +index 0000000..5f27969 +--- /dev/null ++++ b/src/empathy-indicator-manager.c +@@ -0,0 +1,336 @@ ++#include ++ ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "empathy-event-manager.h" ++#include "empathy-indicator.h" ++#include "empathy-indicator-manager.h" ++#include "empathy-misc.h" ++ ++#include ++ ++#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndicatorManager) ++ ++enum { ++ SERVER_ACTIVATE, ++ LAST_SIGNAL ++}; ++ ++static guint signals[LAST_SIGNAL]; ++ ++typedef struct { ++ EmpathyEventManager *event_manager; ++ IndicateServer *indicate_server; ++ GSList *indicator_events; ++ GHashTable *login_timeouts; ++} EmpathyIndicatorManagerPriv; ++ ++typedef struct { ++ EmpathyIndicator *indicator; ++ EmpathyEvent *event; ++} IndicatorEvent; ++ ++typedef struct { ++ EmpathyIndicatorManager *manager; ++ EmpathyIndicator *indicator; ++} LoginData; ++ ++G_DEFINE_TYPE (EmpathyIndicatorManager, empathy_indicator_manager, G_TYPE_OBJECT); ++ ++static EmpathyIndicatorManager * manager_singleton = NULL; ++ ++static void ++free_indicator_event (IndicatorEvent *indicator_event) ++{ ++ g_object_unref(indicator_event->indicator); ++ g_free(indicator_event); ++} ++ ++static void ++indicate_server_activate (IndicateServer *server, ++ EmpathyIndicatorManager *manager) ++{ ++ g_signal_emit (manager, signals[SERVER_ACTIVATE], 0); ++} ++ ++static void ++indicate_show_cb (EmpathyIndicator *indicator, ++ EmpathyEvent *event) ++{ ++ empathy_event_activate (event); ++} ++ ++static void ++indicator_manager_event_added_cb (EmpathyEventManager *event_manager, ++ EmpathyEvent *event, ++ EmpathyIndicatorManager *manager) ++{ ++ EmpathyIndicator *indicator; ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (manager); ++ IndicatorEvent *indicator_event; ++ ++ if (!event->contact) ++ return; ++ indicator = empathy_indicator_new (event->contact, event->message, "im"); ++ if (!indicator) ++ return; ++ empathy_indicator_show (indicator); ++ g_signal_connect(G_OBJECT(indicator), "activate", ++ G_CALLBACK(indicate_show_cb), ++ event); ++ indicator_event = (IndicatorEvent *) g_malloc(sizeof(IndicatorEvent)); ++ indicator_event->indicator = g_object_ref(indicator); ++ indicator_event->event = event; ++ priv->indicator_events = g_slist_prepend(priv->indicator_events, ++ indicator_event); ++} ++ ++static void ++indicator_manager_event_removed_cb (EmpathyEventManager *event_manager, ++ EmpathyEvent *event, ++ EmpathyIndicatorManager *manager) ++{ ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (manager); ++ GSList *l; ++ IndicatorEvent *ret = NULL; ++ ++ for (l = priv->indicator_events; l; l = l->next) ++ { ++ IndicatorEvent *indicator_event = l->data; ++ if (indicator_event->event == event) { ++ ret = indicator_event; ++ break; ++ } ++ } ++ ++ if (!ret) ++ return; ++ ++ priv->indicator_events = g_slist_remove (priv->indicator_events, ret); ++ ++ empathy_indicator_hide (ret->indicator); ++ free_indicator_event (ret); ++} ++ ++static void ++indicator_manager_event_updated_cb (EmpathyEventManager *event_manager, ++ EmpathyEvent *event, ++ EmpathyIndicatorManager *manager) ++{ ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (manager); ++ GSList *l; ++ IndicatorEvent *ret = NULL; ++ ++ for (l = priv->indicator_events; l; l = l->next) ++ { ++ IndicatorEvent *indicator_event = l->data; ++ if (indicator_event->event == event) { ++ ret = indicator_event; ++ break; ++ } ++ } ++ ++ if (!ret) ++ return; ++ ++ empathy_indicator_update (ret->indicator, event->message); ++} ++ ++static gboolean ++indicate_login_timeout (gpointer data) ++{ ++ LoginData *login_data = (LoginData *)data; ++ EmpathyIndicator *e_indicator = login_data->indicator; ++ EmpathyIndicatorManager *manager = login_data->manager; ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (manager); ++ GValue *wrapped_timeout; ++ guint login_timeout; ++ ++ wrapped_timeout = g_hash_table_lookup (priv->login_timeouts, e_indicator); ++ if (wrapped_timeout) { ++ login_timeout = g_value_get_uint (wrapped_timeout); ++ g_hash_table_remove (priv->login_timeouts, e_indicator); ++ empathy_indicator_hide (e_indicator); ++ g_object_unref(e_indicator); ++ g_slice_free (GValue, wrapped_timeout); ++ } ++ g_object_unref (e_indicator); ++ g_object_unref (manager); ++ g_slice_free (LoginData, data); ++ ++ return FALSE; ++} ++ ++static void ++indicate_login_cb (EmpathyIndicator *e_indicator, ++ EmpathyIndicatorManager *manager) ++{ ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (manager); ++ GSList *events, *l; ++ EmpathyContact *contact; ++ ++ g_hash_table_remove (priv->login_timeouts, e_indicator); ++ empathy_indicator_hide (e_indicator); ++ g_object_unref (e_indicator); ++ ++ contact = empathy_indicator_get_contact (e_indicator); ++ /* If the contact has an event activate it, otherwise the ++ * default handler of row-activated will be called. */ ++ events = empathy_event_manager_get_events (priv->event_manager); ++ for (l = events; l; l = l->next) { ++ EmpathyEvent *event = l->data; ++ ++ if (event->contact == contact) { ++ empathy_event_activate (event); ++ return; ++ } ++ } ++ ++ /* Else start a new conversation */ ++ empathy_dispatcher_chat_with_contact (contact, NULL, NULL); ++} ++ ++EmpathyIndicatorManager * ++empathy_indicator_manager_dup_singleton (void) ++{ ++ return g_object_new (EMPATHY_TYPE_INDICATOR_MANAGER, NULL); ++} ++ ++static void ++indicator_manager_finalize (GObject *object) ++{ ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (object); ++ ++ g_slist_foreach (priv->indicator_events, (GFunc) free_indicator_event, ++ NULL); ++ g_object_unref (priv->event_manager); ++ g_object_unref (priv->indicate_server); ++ g_object_unref (priv->login_timeouts); ++} ++ ++static GObject * ++indicator_manager_constructor (GType type, ++ guint n_props, ++ GObjectConstructParam *props) ++{ ++ GObject *retval; ++ ++ if (manager_singleton) { ++ retval = g_object_ref (manager_singleton); ++ } else { ++ retval = G_OBJECT_CLASS (empathy_indicator_manager_parent_class)->constructor ++ (type, n_props, props); ++ ++ manager_singleton = EMPATHY_INDICATOR_MANAGER (retval); ++ g_object_add_weak_pointer (retval, (gpointer) &manager_singleton); ++ } ++ ++ return retval; ++} ++ ++static void ++empathy_indicator_manager_class_init (EmpathyIndicatorManagerClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->finalize = indicator_manager_finalize; ++ object_class->constructor = indicator_manager_constructor; ++ ++ signals[SERVER_ACTIVATE] = ++ g_signal_new ("server-activate", ++ G_TYPE_FROM_CLASS (klass), ++ G_SIGNAL_RUN_LAST, ++ 0, ++ NULL, NULL, ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, ++ 0); ++ ++ g_type_class_add_private (object_class, sizeof (EmpathyIndicatorManagerPriv)); ++} ++ ++static void ++empathy_indicator_manager_init (EmpathyIndicatorManager *manager) ++{ ++ EmpathyIndicatorManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, ++ EMPATHY_TYPE_INDICATOR_MANAGER, EmpathyIndicatorManagerPriv); ++ ++ manager->priv = priv; ++ ++ priv->event_manager = empathy_event_manager_dup_singleton (); ++ priv->login_timeouts = g_hash_table_new (NULL, NULL); ++ priv->indicate_server = indicate_server_ref_default(); ++ indicate_server_set_type (priv->indicate_server, "message.instant"); ++ indicate_server_set_desktop_file (priv->indicate_server, "/usr/share/applications/empathy.desktop"); ++ ++ g_signal_connect (priv->indicate_server, ++ INDICATE_SERVER_SIGNAL_SERVER_DISPLAY, ++ G_CALLBACK(indicate_server_activate), ++ manager); ++ ++ g_signal_connect (priv->event_manager, "event-added", ++ G_CALLBACK (indicator_manager_event_added_cb), ++ manager); ++ g_signal_connect (priv->event_manager, "event-removed", ++ G_CALLBACK (indicator_manager_event_removed_cb), ++ manager); ++ g_signal_connect (priv->event_manager, "event-updated", ++ G_CALLBACK (indicator_manager_event_updated_cb), ++ manager); ++} ++ ++void ++empathy_indicator_manager_set_server_visible (EmpathyIndicatorManager *manager, ++ gboolean visible) ++{ ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (manager); ++ ++ if (visible) { ++ indicate_server_show (priv->indicate_server); ++ } else { ++ /* Causes a crash on next show currently due to object not being ++ unregistered from dbus ++ indicate_server_hide (priv->indicate_server); ++ */ ++ } ++} ++ ++EmpathyIndicator * ++empathy_indicator_manager_add_indicator (EmpathyIndicatorManager *manager, ++ EmpathyContact *sender, ++ const gchar *body) ++{ ++ return empathy_indicator_new (sender, body, "im"); ++} ++ ++void ++empathy_indicator_manager_add_login_indicator (EmpathyIndicatorManager *manager, ++ EmpathyContact *contact) ++{ ++ EmpathyIndicatorManagerPriv *priv = GET_PRIV (manager); ++ guint login_timeout; ++ GValue *wrapped_timeout; ++ EmpathyIndicator *e_indicator = empathy_indicator_new (contact, NULL, "login"); ++ LoginData *login_data = g_slice_new0 (LoginData); ++ if (!login_data) { ++ return; ++ } ++ login_data->indicator = g_object_ref(e_indicator); ++ login_data->manager = g_object_ref(manager); ++ ++ login_timeout = g_timeout_add_seconds(15, indicate_login_timeout, login_data); ++ wrapped_timeout = g_slice_new0 (GValue); ++ g_value_init (wrapped_timeout, G_TYPE_UINT); ++ g_value_set_uint (wrapped_timeout, login_timeout); ++ g_hash_table_insert (priv->login_timeouts, e_indicator, wrapped_timeout); ++ g_signal_connect(e_indicator, "activate", ++ G_CALLBACK(indicate_login_cb), manager); ++ empathy_indicator_show (e_indicator); ++} +diff --git a/src/empathy-indicator-manager.h b/src/empathy-indicator-manager.h +new file mode 100644 +index 0000000..75c9a82 +--- /dev/null ++++ b/src/empathy-indicator-manager.h +@@ -0,0 +1,44 @@ ++#ifndef EMPATHY_INDICATOR_MANAGER_H ++#define EMPATHY_INDICATOR_MANAGER_H ++ ++#include ++ ++#include ++#include "empathy-indicator.h" ++ ++G_BEGIN_DECLS ++ ++#define EMPATHY_TYPE_INDICATOR_MANAGER (empathy_indicator_manager_get_type ()) ++#define EMPATHY_INDICATOR_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_INDICATOR_MANAGER, EmpathyIndicatorManager)) ++#define EMPATHY_INDICATOR_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_INDICATOR_MANAGER, EmpathyIndicatorManagerClass)) ++#define EMPATHY_IS_INDICATOR_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDICATOR_MANAGER)) ++#define EMPATHY_IS_INDICATOR_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDICATOR_MANAGER)) ++#define EMPATHY_INDICATOR_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDICATOR_MANAGER, EmpathyIndicatorManagerClass)) ++ ++typedef struct _EmpathyIndicatorManager EmpathyIndicatorManager; ++typedef struct _EmpathyIndicatorManagerClass EmpathyIndicatorManagerClass; ++ ++struct _EmpathyIndicatorManager { ++ GObject parent; ++ gpointer priv; ++}; ++ ++struct _EmpathyIndicatorManagerClass { ++ GObjectClass parent_class; ++}; ++ ++GType empathy_indicator_manager_get_type (void) G_GNUC_CONST; ++EmpathyIndicatorManager *empathy_indicator_manager_dup_singleton (void); ++void empathy_indicator_manager_set_server_visible (EmpathyIndicatorManager *manager, ++ gboolean visible); ++EmpathyIndicator * empathy_indicator_manager_add_indicator ( ++ EmpathyIndicatorManager *manager, ++ EmpathyContact *sender, ++ const gchar *body); ++void empathy_indicator_manager_add_login_indicator ( ++ EmpathyIndicatorManager *manager, ++ EmpathyContact *contact); ++ ++G_END_DECLS ++ ++#endif /* EMPATHY_INDICATOR_MANAGER_H */ +diff --git a/src/empathy-indicator.c b/src/empathy-indicator.c +new file mode 100644 +index 0000000..e5e3e9c +--- /dev/null ++++ b/src/empathy-indicator.c +@@ -0,0 +1,160 @@ ++#include ++ ++#include ++#include ++ ++#include "empathy-indicator.h" ++#include "empathy-misc.h" ++ ++#include ++ ++#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndicator) ++ ++enum { ++ ACTIVATE, ++ LAST_SIGNAL ++}; ++ ++static guint signals[LAST_SIGNAL]; ++ ++typedef struct { ++ IndicateIndicator *indicator; ++ EmpathyContact *contact; ++} EmpathyIndicatorPriv; ++ ++G_DEFINE_TYPE(EmpathyIndicator, empathy_indicator, G_TYPE_OBJECT) ++ ++static void ++empathy_indicator_finalize (GObject *object) ++{ ++ EmpathyIndicatorPriv *priv = GET_PRIV (object); ++ ++ g_object_unref (priv->indicator); ++ g_object_unref (priv->contact); ++} ++ ++static GObject * ++empathy_indicator_constructor (GType type, ++ guint n_props, ++ GObjectConstructParam *props) ++{ ++ GObject *retval; ++ ++ retval = G_OBJECT_CLASS (empathy_indicator_parent_class)->constructor ++ (type, n_props, props); ++ ++ return retval; ++} ++ ++static void ++empathy_indicator_class_init (EmpathyIndicatorClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->finalize = empathy_indicator_finalize; ++ object_class->constructor = empathy_indicator_constructor; ++ ++ signals[ACTIVATE] = ++ g_signal_new ("activate", ++ G_TYPE_FROM_CLASS (klass), ++ G_SIGNAL_RUN_LAST, ++ 0, ++ NULL, NULL, ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, ++ 0); ++ ++ g_type_class_add_private (object_class, sizeof (EmpathyIndicatorPriv)); ++} ++ ++static void ++indicate_show_cb (IndicateIndicator *indicator, ++ EmpathyIndicator *e_indicator) ++{ ++ g_signal_emit (e_indicator, signals[ACTIVATE], 0); ++} ++ ++static void ++empathy_indicator_init (EmpathyIndicator *e_indicator) ++{ ++ EmpathyIndicatorPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (e_indicator, ++ EMPATHY_TYPE_INDICATOR, EmpathyIndicatorPriv); ++ ++ e_indicator->priv = priv; ++} ++ ++EmpathyIndicator * ++empathy_indicator_new (EmpathyContact *sender, ++ const gchar *body, const gchar *subtype) ++{ ++ GdkPixbuf *pixbuf; ++ GTimeVal time; ++ EmpathyIndicatorPriv *priv; ++ EmpathyIndicator *e_indicator; ++ ++ e_indicator = g_object_new (EMPATHY_TYPE_INDICATOR, NULL); ++ priv = GET_PRIV (e_indicator); ++ ++ priv->indicator = g_object_ref(INDICATE_INDICATOR (indicate_indicator_message_new ())); ++ g_assert (priv->indicator); ++ indicate_indicator_set_property (priv->indicator, "subtype", g_strdup(subtype)); ++ indicate_indicator_set_property (priv->indicator, "sender", ++ empathy_contact_get_name(sender)); ++ priv->contact = g_object_ref(sender); ++ pixbuf = empathy_misc_get_pixbuf_for_indicator (sender); ++ if (pixbuf) { ++ indicate_indicator_set_property_icon (priv->indicator, "icon", ++ gdk_pixbuf_copy (pixbuf)); ++ g_object_unref (pixbuf); ++ } ++ if (body) { ++ indicate_indicator_set_property (priv->indicator, "body", ++ g_strdup (body)); ++ } ++ g_get_current_time(&time); ++ indicate_indicator_set_property_time (priv->indicator, "time", &time); ++ g_signal_connect(G_OBJECT(priv->indicator), ++ INDICATE_INDICATOR_SIGNAL_DISPLAY, ++ G_CALLBACK(indicate_show_cb), ++ e_indicator); ++ ++ return e_indicator; ++} ++ ++void ++empathy_indicator_show (EmpathyIndicator *e_indicator) ++{ ++ EmpathyIndicatorPriv *priv = GET_PRIV (e_indicator); ++ ++ indicate_indicator_show (priv->indicator); ++} ++ ++void ++empathy_indicator_hide (EmpathyIndicator *e_indicator) ++{ ++ EmpathyIndicatorPriv *priv = GET_PRIV (e_indicator); ++ ++ indicate_indicator_hide (priv->indicator); ++} ++ ++void ++empathy_indicator_update (EmpathyIndicator *e_indicator, ++ const gchar *body) ++{ ++ EmpathyIndicatorPriv *priv = GET_PRIV (e_indicator); ++ GTimeVal time; ++ ++ g_get_current_time(&time); ++ indicate_indicator_set_property_time(priv->indicator, "time", &time); ++ if (body) { ++ indicate_indicator_set_property (priv->indicator, "body", ++ g_strdup(body)); ++ } ++} ++ ++EmpathyContact * ++empathy_indicator_get_contact (EmpathyIndicator *e_indicator) ++{ ++ EmpathyIndicatorPriv *priv = GET_PRIV (e_indicator); ++ return priv->contact; ++} +diff --git a/src/empathy-indicator.h b/src/empathy-indicator.h +new file mode 100644 +index 0000000..e050f17 +--- /dev/null ++++ b/src/empathy-indicator.h +@@ -0,0 +1,41 @@ ++#ifndef EMPATHY_INDICATOR_H ++#define EMPATHY_INDICATOR_H ++ ++#include ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define EMPATHY_TYPE_INDICATOR (empathy_indicator_get_type ()) ++#define EMPATHY_INDICATOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_INDICATOR, EmpathyIndicator)) ++#define EMPATHY_INDICATOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_INDICATOR, EmpathyIndicatorClass)) ++#define EMPATHY_IS_INDICATOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDICATOR)) ++#define EMPATHY_IS_INDICATOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDICATOR)) ++#define EMPATHY_INDICATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDICATOR, EmpathyIndicatorClass)) ++ ++typedef struct _EmpathyIndicator EmpathyIndicator; ++typedef struct _EmpathyIndicatorClass EmpathyIndicatorClass; ++ ++struct _EmpathyIndicator { ++ GObject parent; ++ gpointer priv; ++}; ++ ++struct _EmpathyIndicatorClass { ++ GObjectClass parent_class; ++}; ++ ++GType empathy_indicator_get_type (void) G_GNUC_CONST; ++EmpathyIndicator *empathy_indicator_new (EmpathyContact *sender, ++ const gchar *body, const gchar *type); ++void empathy_indicator_show (EmpathyIndicator *e_indicator); ++void empathy_indicator_hide (EmpathyIndicator *e_indicator); ++void empathy_indicator_update (EmpathyIndicator *e_indicator, ++ const gchar *body); ++EmpathyContact *empathy_indicator_get_contact (EmpathyIndicator *e_indicator); ++ ++G_END_DECLS ++ ++ ++#endif /* EMPATHY-INDICATOR_H */ +diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c +index 5830d2b..14e58a0 100644 +--- a/src/empathy-main-window.c ++++ b/src/empathy-main-window.c +@@ -62,6 +62,14 @@ + #include "empathy-event-manager.h" + #include "empathy-ft-manager.h" + ++#ifdef HAVE_LIBINDICATE ++#include "empathy-indicator-manager.h" ++#endif ++ ++#ifdef HAVE_LIBINDICATE ++#include "empathy-indicator-manager.h" ++#endif ++ + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER + #include + +@@ -107,6 +115,10 @@ typedef struct { + + /* Actions that are enabled when there are connected accounts */ + GList *actions_connected; ++#ifdef HAVE_LIBINDICATE ++ EmpathyIndicatorManager *indicator_manager; ++ GHashTable *indicator_timeouts; ++#endif + } EmpathyMainWindow; + + static EmpathyMainWindow *window = NULL; +@@ -596,6 +608,10 @@ main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor, + /* someone is logging in */ + empathy_sound_play (GTK_WIDGET (window->window), + EMPATHY_SOUND_CONTACT_CONNECTED); ++#ifdef HAVE_LIBINDICATE ++ empathy_indicator_manager_add_login_indicator (window->indicator_manager, ++ contact); ++#endif + } + } + +@@ -1169,6 +1185,10 @@ empathy_main_window_show (void) + "help_contents", "activate", main_window_help_contents_cb, + NULL); + ++#ifdef HAVE_LIBINDICATE ++ window->indicator_manager = empathy_indicator_manager_dup_singleton (); ++#endif ++ + /* Set up connection related widgets. */ + main_window_connection_items_setup (window, gui); + +diff --git a/src/empathy-misc.c b/src/empathy-misc.c +index a1a0847..7cfaa2e 100644 +--- a/src/empathy-misc.c ++++ b/src/empathy-misc.c +@@ -30,6 +30,29 @@ + /* public methods */ + + GdkPixbuf * ++empathy_misc_get_pixbuf_for_indicator (EmpathyContact *contact) ++{ ++ GdkPixbuf *pixbuf = NULL; ++ GtkIconTheme *icon_theme; ++ ++ if (contact != NULL) { ++ pixbuf = empathy_pixbuf_avatar_from_contact_scaled (contact, ++ 16, 16); ++ } ++ ++ if (!pixbuf) { ++ icon_theme = gtk_icon_theme_get_default (); ++ /* TODO: connect to icon theme changes */ ++ if (icon_theme) { ++ pixbuf = gtk_icon_theme_load_icon (icon_theme, "stock_person", ++ 16, 0, NULL); ++ } ++ } ++ ++ return pixbuf; ++} ++ ++GdkPixbuf * + empathy_misc_get_pixbuf_for_notification (EmpathyContact *contact, + const char *icon_name) + { +diff --git a/src/empathy-misc.h b/src/empathy-misc.h +index b3fe8fd..38c000f 100644 +--- a/src/empathy-misc.h ++++ b/src/empathy-misc.h +@@ -43,6 +43,7 @@ typedef enum { + gboolean empathy_notification_is_enabled (void); + GdkPixbuf * empathy_misc_get_pixbuf_for_notification (EmpathyContact *contact, + const char *icon_name); ++GdkPixbuf * empathy_misc_get_pixbuf_for_indicator (EmpathyContact *contact); + + G_END_DECLS + +diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c +index 4c88db6..7e128f8 100644 +--- a/src/empathy-preferences.c ++++ b/src/empathy-preferences.c +@@ -52,6 +52,7 @@ typedef struct { + GtkWidget *checkbutton_show_avatars; + GtkWidget *checkbutton_compact_contact_list; + GtkWidget *checkbutton_show_smileys; ++ GtkWidget *checkbutton_use_libindicate; + GtkWidget *combobox_chat_theme; + GtkWidget *hbox_adium_theme; + GtkWidget *filechooserbutton_adium_theme; +@@ -229,6 +230,14 @@ preferences_setup_widgets (EmpathyPreferences *preferences) + EMPATHY_PREFS_UI_SHOW_AVATARS, + preferences->checkbutton_show_avatars); + ++#ifdef HAVE_LIBINDICATE ++ preferences_hookup_toggle_button (preferences, ++ EMPATHY_PREFS_UI_USE_LIBINDICATE, ++ preferences->checkbutton_use_libindicate); ++#else ++ gtk_widget_hide(GTK_WIDGET(preferences->checkbutton_use_libindicate)); ++#endif ++ + preferences_hookup_toggle_button (preferences, + EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, + preferences->checkbutton_compact_contact_list); +@@ -1190,6 +1199,7 @@ empathy_preferences_show (GtkWindow *parent) + "checkbutton_show_avatars", &preferences->checkbutton_show_avatars, + "checkbutton_compact_contact_list", &preferences->checkbutton_compact_contact_list, + "checkbutton_show_smileys", &preferences->checkbutton_show_smileys, ++ "checkbutton_use_libindicate", &preferences->checkbutton_use_libindicate, + "combobox_chat_theme", &preferences->combobox_chat_theme, + "hbox_adium_theme", &preferences->hbox_adium_theme, + "filechooserbutton_adium_theme", &preferences->filechooserbutton_adium_theme, +diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui +index 142e5d7..70776d5 100644 +--- a/src/empathy-preferences.ui ++++ b/src/empathy-preferences.ui +@@ -297,6 +297,20 @@ + 1 + + ++ ++ ++ Use message indicators ++ True ++ True ++ False ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 +diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c +index 9c21948..dccbba4 100644 +--- a/src/empathy-status-icon.c ++++ b/src/empathy-status-icon.c +@@ -26,6 +26,7 @@ + #include + #include + ++#include + #include + + #include +@@ -44,6 +45,10 @@ + #include "empathy-event-manager.h" + #include "empathy-misc.h" + ++#ifdef HAVE_LIBINDICATE ++#include "empathy-indicator-manager.h" ++#endif ++ + #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER + #include + +@@ -67,10 +72,17 @@ typedef struct { + GtkAction *show_window_item; + GtkAction *new_message_item; + GtkAction *status_item; ++#ifdef HAVE_LIBINDICATE ++ EmpathyIndicatorManager *indicator_manager; ++#endif + } EmpathyStatusIconPriv; + + G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT); + ++#ifdef HAVE_LIBINDICATE ++static void indicate_server_activate_cb (EmpathyIndicatorManager *, EmpathyStatusIcon *); ++#endif ++ + static gboolean + activate_event (EmpathyEvent *event) + { +@@ -79,6 +91,29 @@ activate_event (EmpathyEvent *event) + return FALSE; + } + ++static gboolean ++notification_server_supports_actions (void) ++{ ++ GList * caps = notify_get_server_caps(); ++ GList * l; ++ gboolean ret = FALSE; ++ ++ for (l = caps; l; l = l->next) { ++ gchar *cap = (gchar *)l->data; ++ if (!cap) { ++ continue; ++ } ++ if (!strcmp(cap, "actions")) { ++ ret = TRUE; ++ break; ++ } ++ } ++ g_list_foreach(caps, (GFunc)g_free, NULL); ++ g_list_free(caps); ++ ++ return ret; ++} ++ + static void + status_icon_notification_closed_cb (NotifyNotification *notification, + EmpathyStatusIcon *icon) +@@ -108,8 +143,9 @@ status_icon_notification_closed_cb (NotifyNotification *notification, + */ + g_idle_add ((GSourceFunc) activate_event, priv->event); + } else { +- /* inhibit other updates for this event */ +- empathy_event_inhibit_updates (priv->event); ++ if (notification_server_supports_actions ()) { ++ empathy_event_inhibit_updates (priv->event); ++ } + } + } + +@@ -317,6 +353,25 @@ status_icon_set_visibility (EmpathyStatusIcon *icon, + } + } + ++#ifdef HAVE_LIBINDICATE ++static void ++status_icon_set_use_libindicate (EmpathyStatusIcon *icon, ++ gboolean use_libindicate) ++{ ++ EmpathyStatusIconPriv *priv = GET_PRIV (icon); ++ ++ if (use_libindicate) { ++ empathy_indicator_manager_set_server_visible (priv->indicator_manager, ++ TRUE); ++ gtk_status_icon_set_visible(priv->icon, FALSE); ++ } else { ++ empathy_indicator_manager_set_server_visible (priv->indicator_manager, ++ FALSE); ++ gtk_status_icon_set_visible(priv->icon, TRUE); ++ } ++} ++#endif ++ + static void + status_icon_notify_visibility_cb (EmpathyConf *conf, + const gchar *key, +@@ -330,16 +385,51 @@ status_icon_notify_visibility_cb (EmpathyConf *conf, + } + } + ++#ifdef HAVE_LIBINDICATE ++static void ++status_icon_notify_libindicate_cb (EmpathyConf *conf, ++ const gchar *key, ++ gpointer user_data) ++{ ++ EmpathyStatusIcon *icon = user_data; ++ gboolean use_libindicate = FALSE; ++ ++ if (empathy_conf_get_bool (conf, key, &use_libindicate)) { ++ status_icon_set_use_libindicate (icon, use_libindicate); ++ } ++} ++#endif ++ + static void + status_icon_toggle_visibility (EmpathyStatusIcon *icon) + { + EmpathyStatusIconPriv *priv = GET_PRIV (icon); + gboolean visible; ++#ifdef HAVE_LIBINDICATE ++ gboolean use_libindicate; ++#endif + + visible = gtk_window_is_active (priv->window); ++#ifdef HAVE_LIBINDICATE ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_UI_USE_LIBINDICATE, ++ &use_libindicate); ++ if (use_libindicate) { ++ visible = GTK_WIDGET_VISIBLE (priv->window); ++ } ++#endif + status_icon_set_visibility (icon, !visible, TRUE); + } + ++#ifdef HAVE_LIBINDICATE ++static void ++indicate_server_activate_cb (EmpathyIndicatorManager *manager, ++ EmpathyStatusIcon *icon) ++{ ++ status_icon_toggle_visibility(icon); ++} ++#endif ++ + static void + status_icon_idle_notify_cb (EmpathyStatusIcon *icon) + { +@@ -554,6 +644,13 @@ empathy_status_icon_init (EmpathyStatusIcon *icon) + status_icon_notify_visibility_cb, + icon); + ++#ifdef HAVE_LIBINDICATE ++ empathy_conf_notify_add (empathy_conf_get (), ++ EMPATHY_PREFS_UI_USE_LIBINDICATE, ++ status_icon_notify_libindicate_cb, ++ icon); ++#endif ++ + status_icon_create_menu (icon); + status_icon_idle_notify_cb (icon); + +@@ -583,6 +680,9 @@ empathy_status_icon_new (GtkWindow *window, gboolean hide_contact_list) + EmpathyStatusIconPriv *priv; + EmpathyStatusIcon *icon; + gboolean should_hide; ++#ifdef HAVE_LIBINDICATE ++ gboolean use_libindicate; ++#endif + + g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); + +@@ -590,6 +690,12 @@ empathy_status_icon_new (GtkWindow *window, gboolean hide_contact_list) + priv = GET_PRIV (icon); + + priv->window = g_object_ref (window); ++#ifdef HAVE_LIBINDICATE ++ priv->indicator_manager = empathy_indicator_manager_dup_singleton (); ++ g_signal_connect (priv->indicator_manager, "server-activate", ++ G_CALLBACK (indicate_server_activate_cb), ++ icon); ++#endif + + g_signal_connect_after (priv->window, "key-press-event", + G_CALLBACK (status_icon_key_press_event_cb), +@@ -607,6 +713,13 @@ empathy_status_icon_new (GtkWindow *window, gboolean hide_contact_list) + should_hide = TRUE; + } + ++#ifdef HAVE_LIBINDICATE ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_UI_USE_LIBINDICATE, ++ &use_libindicate); ++ status_icon_set_use_libindicate (icon, use_libindicate); ++#endif ++ + if (gtk_window_is_active (priv->window) == should_hide) { + status_icon_set_visibility (icon, !should_hide, FALSE); + }