| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Reorder some inclusions and remove a few blank lines.
https://bugzilla.gnome.org/show_bug.cgi?id=697076
|
|
|
|
|
| |
tp-glib 1.0 will enforce to only include telepathy-glib.h so best doing it to
reduce the delta with the future stable branch.
|
|
|
|
|
|
| |
This reverts commit afb9276b8a497e7b9275fb53abafd0cdb18d55fc.
https://bugzilla.gnome.org/show_bug.cgi?id=675296
|
|
|
|
| |
This reverts commit f90421fd29108507c722c03e28bc16e4b5baf7c0.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
libempathy-gtk/empathy-individual-menu.c
libempathy-gtk/empathy-new-message-dialog.c
libempathy/empathy-dispatcher.c
libempathy/empathy-dispatcher.h
src/empathy-chat-manager.c
src/empathy-chat-window.c
|
| |
|
|
|
|
| |
as empathy-dispatcher has been deleted in master
|
|
|
|
| |
It's more convenient and safe than hardcoding them everywhere.
|
|
We don't have EmpathyDispatcher any more so this file just contains some
utility functions now.
|