aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* new-chatroom-dialog: use TpRoomListGuillaume Desmottes2012-05-101-103/+76
* remove invisible_char from ui filesGuillaume Desmottes2012-05-101-2/+0
* Turn EmpathyNewChatroomDialog to a GtkDialog sub-classGuillaume Desmottes2012-05-103-458/+491
* chatroom-dialog: re-order some functionsGuillaume Desmottes2012-05-101-355/+299
* new-chatroom-dialog: port to TP coding styleGuillaume Desmottes2012-05-102-640/+642
* Use TpTpTLSCertificateGuillaume Desmottes2012-05-101-11/+13
* Store the TpDebugMessage in the modelGuillaume Desmottes2012-05-101-134/+131
* merge store_filter_foreach () and copy_model_foreach ()Guillaume Desmottes2012-05-101-61/+14
* debug-window: use TpDebugClientGuillaume Desmottes2012-05-101-70/+89
* empathy-debugger: use self->priv patternGuillaume Desmottes2012-05-102-278/+267
* debug_window_dispose: use g_clear_object()Guillaume Desmottes2012-05-101-20/+4
* new-account-dialog: rely on the EmpathyAccountWidget::close signalGuillaume Desmottes2012-05-091-1/+1
* video-widget: Remove as it is now unusedOlivier Crête2012-05-094-592/+6
* call-observer: use tp_channel_get_target_contact()Guillaume Desmottes2012-05-081-32/+4
* Turn EmpathyAccountWidget to a proper GtkWidgetGuillaume Desmottes2012-05-081-29/+23
* approve_ft_channel: stop using the contact factoryGuillaume Desmottes2012-05-081-37/+20
* approve_call_channel: stop using the contact factoryGuillaume Desmottes2012-05-081-65/+47
* event-manager: factor out approve_channel_*() functionsGuillaume Desmottes2012-05-081-94/+141
* Use gst_object_ref_sink()Javier Jardón2012-05-082-7/+4
* Use TP_ERROR instead of TP_ERRORSGuillaume Desmottes2012-05-073-6/+6
* Fix localization of --help outputs and application namesGabor Kelemen2012-05-035-5/+9
* accounts-dialog: stop using tp_connection_get_self_handle()Guillaume Desmottes2012-05-031-17/+8
* invite-participant-dialog: compare TpContact objects rather than handlesGuillaume Desmottes2012-05-031-6/+4
* empathy_tp_chat_is_invited: return a TpContact for the inviterGuillaume Desmottes2012-05-031-30/+5
* event-manager: use new channel group APIGuillaume Desmottes2012-05-031-4/+4
* invite-participant-dialog: stop using tp_channel_group_get_handle_owner()Guillaume Desmottes2012-05-031-2/+5
* chat-manager: use tp_channel_join_async()Guillaume Desmottes2012-05-031-1/+17
* remove empathy-avGuillaume Desmottes2012-05-0213-6510/+0
* Stop approving StreamedMedia channelsGuillaume Desmottes2012-05-023-94/+2
* roster-window: set a default heightGuillaume Desmottes2012-04-201-0/+1
* Merge branch 'gnome-3-4'Guillaume Desmottes2012-04-112-7/+1
|\
| * Don't display anything when being re-invoked in hidden modeGuillaume Desmottes2012-04-111-7/+0
| * roster-window: Bring back log entry in individual context menuGuillaume Desmottes2012-04-051-0/+1
* | remove useless empathy-contact-list.h includesGuillaume Desmottes2012-04-103-3/+0
* | implement empathy_tp_chat_get_members as a method on TpChatGuillaume Desmottes2012-04-101-2/+1
* | implement empathy_tp_chat_add as a method on TpChatGuillaume Desmottes2012-04-101-3/+2
* | Allocate GMutex on the stackGuillaume Desmottes2012-04-055-65/+66
* | stop using g_thread_initGuillaume Desmottes2012-04-057-14/+0
* | stop instantiating EmpathyConnectivityGuillaume Desmottes2012-04-051-22/+0
* | accounts-dialog: use GNetworkMonitorGuillaume Desmottes2012-04-051-10/+10
* | Remove Meego specific codeGuillaume Desmottes2012-04-051-37/+0
* | Merge branch 'gnome-3-4'Guillaume Desmottes2012-04-052-2/+4
|\|
| * check if salut settings are valid instead of assume they are notGuillaume Desmottes2012-04-041-1/+3
| * include logger single headerGuillaume Desmottes2012-04-041-1/+1
* | account-dialog: add 'Rename' item to the context menuGuillaume Desmottes2012-04-021-0/+33
* | accounts-dialog: keep a pointer on the text rendererGuillaume Desmottes2012-04-021-7/+9
* | replace Enable/Disable menu items by a check itemGuillaume Desmottes2012-04-021-37/+15
|/
* call-window: raise the overlay actor instead of individual actorsCosimo Cecchi2012-03-301-13/+2
* use enable_and_connect_account() when enabling an account from the menuGuillaume Desmottes2012-03-301-1/+2
* factor out enable_and_connect_account()Guillaume Desmottes2012-03-301-2/+9
* accounts-dialog: no need to connect the account if we are disabling itGuillaume Desmottes2012-03-301-5/+13
* accounts_dialog_enable_account_cb: use the usual async cb patternGuillaume Desmottes2012-03-301-10/+9
* empathy-accounts: disable 'Enable' menu entry if not supportedGuillaume Desmottes2012-03-301-6/+14
* factor out account_can_be_enabled()Guillaume Desmottes2012-03-301-9/+18
* ev-sidebar: use gtk_list_store_insert_with_values()Guillaume Desmottes2012-03-291-2/+1
* preferences: use gtk_list_store_insert_with_values()Guillaume Desmottes2012-03-291-3/+1
* new-chatroom-dialog: use gtk_list_store_insert_with_values()Guillaume Desmottes2012-03-291-3/+1
* import-widget: use gtk_list_store_insert_with_values()Guillaume Desmottes2012-03-291-4/+1
* chatrooms-window: use gtk_list_store_insert_with_values()Guillaume Desmottes2012-03-291-2/+1
* accounts-dialog: use gtk_list_store_insert_with_values()Guillaume Desmottes2012-03-291-8/+13
* Merge remote-tracking branch 'wjt/652800-661731-notifications'Guillaume Desmottes2012-03-283-22/+25
|\
| * Move category name constants to #definesWill Thompson2012-03-283-21/+19
| * Show MUC highlight notifications in Gnome ShellWill Thompson2012-03-281-3/+8
* | streamed-media-window: don't leak the element nameDebarshi Ray2012-03-281-2/+4
* | call-window: don't leak the element nameDebarshi Ray2012-03-281-2/+4
|/
* call-window: factor out some common codeCosimo Cecchi2012-03-271-14/+14
* call-window: don't use EmpathyRoundedActor for the floating toolbarCosimo Cecchi2012-03-272-31/+25
* call-window: use a ClutterBoxLayout to separate previews/toolbarCosimo Cecchi2012-03-271-128/+68
* call-window: fix incorrect commentCosimo Cecchi2012-03-271-3/+2
* call-window: use colors from the theme for placeholdersCosimo Cecchi2012-03-271-2/+30
* rounded-rectangle: cairo_set_source_rgba() takes [0..1] argumentsCosimo Cecchi2012-03-271-7/+6
* import-widget: request the preferred height of the treeviewGuillaume Desmottes2012-03-272-2/+11
* import-widget: don't manually prepare the account managerGuillaume Desmottes2012-03-271-23/+4
* Use the correct help: URI syntaxShaun McCance2012-03-262-2/+2
* roster-window: check which page to display once Folks has finished loadingGuillaume Desmottes2012-03-221-1/+1
* Use help:empathy to open the helpGuillaume Desmottes2012-03-224-4/+4
* debug-window: no need to translate the '%s' formatGuillaume Desmottes2012-03-221-1/+1
* accounts-dialog: set a column spacing for the GtkInfoBar gridCosimo Cecchi2012-03-211-0/+1
* Fix crash on hangup with no videoEmanuele Aina2012-03-161-4/+5
* Don't restart a call if one already in progressEmanuele Aina2012-03-161-5/+10
* contact-widget: don't display the account when editing our infoGuillaume Desmottes2012-03-161-1/+2
* Disconnect when a call is ENDEDEmanuele Aina2012-03-151-5/+8
* reload the account widget when connection is (dis)connectedGuillaume Desmottes2012-03-151-0/+45
* create_dialog_content: check if the TpConnection is still validGuillaume Desmottes2012-03-151-1/+2
* factor out account_is_selected()Guillaume Desmottes2012-03-151-16/+27
* sanity-cleaning: set fallback-servers on Facebook accountsGuillaume Desmottes2012-03-151-1/+42
* Merge remote-tracking branch 'gulic/buttons-668464'Danielle Madeley2012-03-141-2/+3
|\
| * favorite chatrooms dialog: use the right style for the remove buttonGuillaume Desmottes2012-01-231-2/+3
* | Avoid clipping buttons in the call windowEmanuele Aina2012-03-121-11/+8
* | Merge remote-tracking branch 'em/fix-highlight-roundedness-671720'Guillaume Desmottes2012-03-125-50/+64
|\ \
| * | Match the preview highlight roundedness with the videoEmanuele Aina2012-03-125-41/+44
| * | rounded-rectangle: use the 'draw' signalGuillaume Desmottes2012-03-121-9/+20
* | | early return if accounts_dialog_model_get_selected_settings() returns NULLGuillaume Desmottes2012-03-121-0/+4
|/ /
* | video-widget: don't set priv->sink_pad twiceGuillaume Desmottes2012-03-091-2/+0
* | Don't clip overflowing border when drawing rounded rectanglesEmanuele Aina2012-03-092-9/+23
* | MUC: make F9 toggle the contact list sidebarWill Thompson2012-03-071-0/+1
* | add missing config.h includesGuillaume Desmottes2012-03-075-0/+5
* | add missing config.h includesGuillaume Desmottes2012-03-072-0/+4
* | stop using gtk_vscale_new_with_range()Guillaume Desmottes2012-03-071-2/+4
* | sanity-cleaning: fix xmpp accounts having a negative priorityGuillaume Desmottes2012-03-061-1/+63
* | Add magic to automatically run tasks when empathy-auth-client is startedGuillaume Desmottes2012-03-064-0/+120
* | 'ice-udp' capability is now 'ice' in Call1Guillaume Desmottes2012-03-061-1/+1
* | advertise Call1 audio/video capabilitiesGuillaume Desmottes2012-03-061-0/+2
* | call-factory: set Call1 capabilitiesGuillaume Desmottes2012-03-061-4/+4
* | empathy-call doesn't need ev-sidebarGuillaume Desmottes2012-03-021-2/+0
* | Revert "Stop approve StreamedMedia channels"Guillaume Desmottes2012-03-023-2/+94
* | remove FIXME regarding empathy_tp_streamed_media_accept_incoming_call()Guillaume Desmottes2012-03-021-2/+0
* | fix signature of empathy_streamed_media_handler_tf_content_src_pad_added_cbGuillaume Desmottes2012-03-021-1/+5
* | Farstream port of tp-av oopsOlivier Crête2012-03-021-0/+12
* | Port Empathy-av to Telepathy FarstreamOlivier Crête2012-03-022-76/+76
* | Allow to build with empathy-avGuillaume Desmottes2012-03-024-11/+14
* | Revert "Drop empathy-av"Guillaume Desmottes2012-03-0111-0/+6062
* | Revert "remove ev-sidebar"Guillaume Desmottes2012-03-013-0/+430
* | Make clear work on All's bufferChandni Verma2012-03-011-0/+9
* | audio-sink: don't unref subpadGuillaume Desmottes2012-02-281-4/+1
* | empathy_call_window_content_added_cb: fix pad leakGuillaume Desmottes2012-02-271-0/+2
* | audio-sink: fix GstPad leaksGuillaume Desmottes2012-02-271-1/+6
* | call-window: don't leak the ClutterStateGuillaume Desmottes2012-02-241-0/+1
* | call-window: use empathy_call_handler_get_contact()Guillaume Desmottes2012-02-231-1/+2
* | call: don't leak the contactGuillaume Desmottes2012-02-231-1/+1
* | add empathy_call_handler_get_contact()Guillaume Desmottes2012-02-232-0/+8
* | call-window: don't leak the contactGuillaume Desmottes2012-02-231-4/+1
* | Don't disconnect the contact_name_changed_cb cbGuillaume Desmottes2012-02-231-2/+0
* | Stop using Farsight2 headersGert Kulyk2012-02-233-4/+4
* | check gtk_clutter_init() return valueGuillaume Desmottes2012-02-221-1/+2
* | empathy-call: no need to call gtk_clutter_init()Guillaume Desmottes2012-02-221-1/+0
* | check coding style of all binariesGuillaume Desmottes2012-02-211-1/+7
* | remove ev-sidebarGuillaume Desmottes2012-02-213-430/+0
* | debug-window: coding style fixesGuillaume Desmottes2012-02-211-2/+2
* | Drop empathy-avGuillaume Desmottes2012-02-2111-6064/+1
* | Stop approve StreamedMedia channelsGuillaume Desmottes2012-02-213-94/+2
* | always build empathy-callGuillaume Desmottes2012-02-211-4/+0
* | try installing telepathy-hazeGuillaume Desmottes2012-02-211-0/+21
* | explain why the account has been disabledGuillaume Desmottes2012-02-211-2/+13
* | accounts-dialog: hide the switch in butterfly accountsGuillaume Desmottes2012-02-211-2/+9
* | Merge remote-tracking branch 'glassrose/debug-window-send-to-pastebin-button-...Guillaume Desmottes2012-02-211-21/+173
|\ \
| * | License to publish the author's pastebin API developer key in openChandni Verma2012-02-211-1/+2
| * | "Send to pastebin" button in EmpathyDebugWindowChandni Verma2012-02-211-21/+172
* | | drag_data_received_individual_id: make sure manager is initializedGuillaume Desmottes2012-02-211-1/+1
* | | Merge remote-tracking branch 'origin/call1' into master+callGuillaume Desmottes2012-02-2111-374/+163
|\ \ \ | |/ / |/| |
| * | Port DTMF code to new tp-glib APIXavier Claessens2012-01-271-63/+8
| * | Merge branch 'master' into call1Danielle Madeley2012-01-171-30/+51
| |\ \
| * | | call-handler: also accept outgoing calls immediatelyDanielle Madeley2012-01-131-4/+15
| * | | call-handler: check the state before deferring the accept()Danielle Madeley2012-01-121-1/+7
| * | | Wait for call state to be INITIALISED before accepting incoming callXavier Claessens2012-01-101-21/+26
| * | | Remove tp-yell and use TpCallChannelXavier Claessens2012-01-1011-299/+121
* | | | chat-window: invite contacts using DnDGuillaume Desmottes2012-02-171-0/+72
* | | | chat-window: display a phone icon in the tab labelGuillaume Desmottes2012-02-171-0/+13
* | | | Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-wi...Guillaume Desmottes2012-02-171-304/+591
|\ \ \ \
| * | | | Use gtk_list_store_insert_with_values ()Chandni Verma2012-01-281-22/+11
| * | | | Un-pausing incoming messages should update All's active buffer tooChandni Verma2012-01-281-3/+8
| * | | | Set window sensitivityChandni Verma2012-01-281-12/+17
| * | | | Add incoming messages to All's bufferChandni Verma2012-01-281-11/+37
| * | | | Refresh "All" selection's active-buffer when neededChandni Verma2012-01-281-34/+157
| * | | | Add "All" selection to service_chooser and all_active_buffer to privChandni Verma2012-01-281-3/+35
| * | | | Preparing for adding "All" option to service_chooserChandni Verma2012-01-281-13/+60
| * | | | Factor out create_proxy_to_get_messagesChandni Verma2012-01-271-35/+60
| * | | | Debug window - Use one active buffer and one pause buffer per serviceChandni Verma2012-01-271-270/+305
* | | | | salut-dialog: use 'Skip' instead of 'Ignore'Guillaume Desmottes2012-02-171-1/+1
* | | | | remove empathy-auto-salut-account-helperGuillaume Desmottes2012-02-175-141/+0
* | | | | Remove empathy-account-assistantGuillaume Desmottes2012-02-172-1379/+0
* | | | | Stop using the accounts assistantGuillaume Desmottes2012-02-171-62/+5
* | | | | empathy-accounts: remove --assistant optionGuillaume Desmottes2012-02-173-10/+3
* | | | | accounts-dialog: suggest to create a salut accountGuillaume Desmottes2012-02-171-2/+68
* | | | | Move should_create_salut_account to local-xmpp-assistant-widgetGuillaume Desmottes2012-02-173-29/+2
* | | | | accounts-dialog: display the import dialog if there is no accountGuillaume Desmottes2012-02-171-0/+17
* | | | | accounts-dialog: improve the 'no protocol installed' messageGuillaume Desmottes2012-02-161-1/+1
* | | | | accounts_dialog_add_account: select if that's the first account addedGuillaume Desmottes2012-02-161-3/+7
* | | | | accounts-dialog: move the 'no protocol' message to a different pageGuillaume Desmottes2012-02-162-44/+48
* | | | | accounts-dialog: remove hbox_protocolGuillaume Desmottes2012-02-162-29/+0
* | | | | accounts-dialog: don't automatically open the add accountGuillaume Desmottes2012-02-161-9/+0
* | | | | import-dialog: set a verb on the 'Ok' buttonGuillaume Desmottes2012-02-161-2/+4
* | | | | import-dialog: expand and fill the import widgetGuillaume Desmottes2012-02-161-1/+1
* | | | | Pass EmpathyConnectionManagers to the import widgetGuillaume Desmottes2012-02-166-30/+70
* | | | | factor out display_import_dialog()Guillaume Desmottes2012-02-161-3/+11
* | | | | remove useless includeGuillaume Desmottes2012-02-161-1/+0
* | | | | empathy-chat: keep the individual manager alive as a cacheGuillaume Desmottes2012-02-151-0/+7
* | | | | set the presence message as a tooltip on its labelGuillaume Desmottes2012-02-151-0/+3
* | | | | accounts-dialog: ellipsize presence messageGuillaume Desmottes2012-02-151-1/+1
* | | | | Display a spinner while loading contacts from FolksGuillaume Desmottes2012-02-142-14/+85
* | | | | Don't unhighlight chat tabs when more messages are receivedWill Thompson2012-02-111-28/+11
* | | | | empathy-call: call XInitThreads()Guillaume Desmottes2012-02-091-0/+10
* | | | | stop using clutter_gst_video_sink_new()Guillaume Desmottes2012-02-091-4/+11
* | | | | Add a gsetting key to show/hide groupsGuillaume Desmottes2012-02-091-0/+3
* | | | | Remove 'Link Contact' menu itemGuillaume Desmottes2012-02-081-1/+0
* | | | | add missing config.hGuillaume Desmottes2012-02-082-0/+3
* | | | | Make the default chat window size bigger.Ken VanDine2012-02-061-2/+2
* | | | | display a message if accounts need to be enabledGuillaume Desmottes2012-02-031-4/+83
* | | | | display a specific message if no account is configuredGuillaume Desmottes2012-02-031-0/+27
* | | | | add generic contact icon and account settings button to the message pageGuillaume Desmottes2012-02-032-4/+73
* | | | | make code displaying the 'no match found' page more genericGuillaume Desmottes2012-02-031-16/+28
* | | | | assistant: hide the buttons in the salut widgetGuillaume Desmottes2012-02-031-0/+2
* | | | | preferences: fix phrasing of the EMPATHY_PREFS_SOUNDS_CONTACT_LOGINGuillaume Desmottes2012-01-311-1/+1
* | | | | Don't warn before leaving disconnected chatroomsWill Thompson2012-01-301-2/+14
* | | | | Shorten "Leave chat room" to "Leave room"Will Thompson2012-01-301-1/+1
* | | | | Special-case closing a window with exactly one tabWill Thompson2012-01-301-0/+13
* | | | | Confirm closing windows containing chat rooms.Will Thompson2012-01-301-31/+115
* | | | | Confirm closing chat room tabsWill Thompson2012-01-301-2/+59
* | | | | roster_window_connection_items_setup: remove edit_personal_informationGuillaume Desmottes2012-01-271-1/+0
* | | | | preferences: split "Open new chats in separate windows" into a radiobuttonDanielle Madeley2012-01-272-10/+43
* | | | | Merge branch 'highlight-regex'Will Thompson2012-01-262-8/+11
|\ \ \ \ \
| * | | | | EmpathyChat: include should_highlight in ::new-messageWill Thompson2012-01-191-1/+2
| * | | | | chat_view_append_message: take a should_highlight argumentWill Thompson2012-01-191-7/+9
| | |_|/ / | |/| | |
* | | | | accounts-dialog: don't add newly created account twiceGuillaume Desmottes2012-01-241-69/+9
* | | | | accounts_dialog_get_account_iter: use the COL_ACCOUNT directlyGuillaume Desmottes2012-01-241-4/+4
* | | | | accounts-dialog: no more need to manually prepare TpAccountGuillaume Desmottes2012-01-241-20/+1
| |_|_|/ |/| | |
* | | | remove 'edit->personnal information' menuGuillaume Desmottes2012-01-202-15/+0
|/ / /
* | | roster-window: watch for TpAccount:connection changesGuillaume Desmottes2012-01-121-4/+25
* | | roster-window: factor out add_account()Guillaume Desmottes2012-01-121-26/+26
| |/ |/|
* | roster-window: use self->priv patternGuillaume Desmottes2012-01-102-447/+390
* | roster-window: port to new coding styleGuillaume Desmottes2012-01-102-1860/+1874
* | rename MainWindow to RosterWindowGuillaume Desmottes2012-01-108-382/+382
* | Disable join button when protocol irc is selectedJovanka Gulicoska2012-01-101-0/+8
* | added # in join room when irc protocol selectedJovanka Gulicoska2012-01-061-0/+6
* | accounts-dialog: remove protocol chooserGuillaume Desmottes2011-12-221-99/+0
* | accounts-dialog: use the new account dialogGuillaume Desmottes2011-12-221-3/+22
* | account-widget: display the buttons in simple mode as wellGuillaume Desmottes2011-12-221-0/+2
* | account_dialog_create_edit_params_dialog: don't connect account-created signalGuillaume Desmottes2011-12-221-24/+0
* | don't use deprecated GTK+ APIGuillaume Desmottes2011-12-221-2/+2
* | display the editor on topGuillaume Desmottes2011-12-221-3/+7
* | properly handle accounts using an external storageGuillaume Desmottes2011-12-221-3/+109
* | No need to manually prepare the connectionGuillaume Desmottes2011-12-221-25/+9
* | add some padding in the edit conn settings dialogGuillaume Desmottes2011-12-221-4/+9
* | add an accelerator to open the params dialogGuillaume Desmottes2011-12-221-1/+1
* | pass a second NULL pointer to gtk_dialog_new_with_buttons()Guillaume Desmottes2011-12-221-1/+1
* | Don't show the presence twiceDanielle Madeley2011-12-221-0/+1
* | Make it possible to add/remove/edit accounts without it crashing everywhereDanielle Madeley2011-12-221-54/+11
* | Add a close signal, emitted by both cancel and applyDanielle Madeley2011-12-221-5/+4
* | Begin combining the dialogsDanielle Madeley2011-12-221-19/+161
* | empathy_chat_window_present_chat: move to the chat window desktopGuillaume Desmottes2011-12-191-2/+6
* | import-widget: use the server in IRC account display nameGuillaume Desmottes2011-12-161-4/+18
* | main-window: stop instantiating the contact managerGuillaume Desmottes2011-12-141-5/+0
* | map-view: use the individual menuGuillaume Desmottes2011-12-141-8/+21
* | remove EMPATHY_INDIVIDUAL_FEATURE_ALLGuillaume Desmottes2011-12-141-2/+19
* | empathy-audio-sink.c: include config.hXavier Claessens2011-12-131-0/+1
* | get_tp_contact_for_chat: deal with tp_channel_borrow_connection() returning NULLGuillaume Desmottes2011-12-121-0/+2
* | auth-client: add some more debuggingGuillaume Desmottes2011-12-081-0/+2
* | Call: Low the video watchdog timeout to 1 secondSjoerd Simons2011-12-071-1/+1
* | about: Polish the code to generate the license stringSjoerd Simons2011-12-071-8/+10
* | map-view: stop using EmpathyContactManagerGuillaume Desmottes2011-12-051-54/+64
* | Properly cast buffer and latency times when setting propertiesGuillaume Desmottes2011-11-302-2/+5
* | event-manager: use the conn aggregator instead of the contact mgrGuillaume Desmottes2011-11-302-34/+104
* | Revert "WIP"Guillaume Desmottes2011-11-292-31/+4
* | WIPGuillaume Desmottes2011-11-292-4/+31
* | Merge remote-tracking branch 'jonny/ft'Guillaume Desmottes2011-11-292-7/+5
|\ \
| * | client-factory: stop creating EmpathyTpFile objectsJonny Lamb2011-11-092-7/+5
* | | groups-widget: use empathy_connection_aggregator_get_all_groups()Guillaume Desmottes2011-11-291-0/+26
| |/ |/|
* | add missing empathy-contact-list.h includeGuillaume Desmottes2011-11-281-0/+1
* | Remove obsolete contact-list-{store,view}Guillaume Desmottes2011-11-241-1/+0
* | add EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACTGuillaume Desmottes2011-11-241-1/+1