diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-01 13:04:06 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-01 13:04:06 -0500 |
| commit | 24ca5a26c8365a326d2911cf590d48b75d6356d4 (patch) | |
| tree | 8261bd4a6ae25fb0f75cc13650005603a87fe5ca | |
| parent | 3e1faa87ff12747526293e79fb7f9312c7877a49 (diff) | |
| parent | 4e8b207a29871f4ddf13019d7ddb5e27430bef37 (diff) | |
| download | telepathy-logger-24ca5a26c8365a326d2911cf590d48b75d6356d4.tar.gz | |
Merge branch 'trivia'
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | telepathy-logger/log-store-xml.c | 8 |
3 files changed, 4 insertions, 12 deletions
@@ -10,11 +10,6 @@ information related to logging (most frequent contacts, etc.). It also provides a GLib-compatible client API for making bulk log requests (e.g. for display logs in applications without having to provide lots of information over D-Bus). -N.B. telepathy-logger and libtelepathy-logger currently include some - GPL-licensed code, so can be considered licensed under the GPL. - It is our eventual goal to allow libtelepathy-logger to be licensed under - the LGPL v2.1. - TPL is currently under development, please refer to http://telepathy.freedesktop.org/wiki/Logger for more information. diff --git a/configure.ac b/configure.ac index 6f9584f..7b00710 100644 --- a/configure.ac +++ b/configure.ac @@ -80,8 +80,6 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR(.) -GNOME_COMMON_INIT - AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define no-dist-gzip tar-ustar -Wno-portability) AC_SEARCH_LIBS([strerror],[cposix]) AC_PROG_CC @@ -91,7 +89,6 @@ AM_PROG_MKDIR_P AM_PATH_GLIB_2_0 AC_PATH_XTRA IT_PROG_INTLTOOL([0.35.0]) -GNOME_DOC_INIT([0.17.3]) AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) GLIB_GSETTINGS GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index cddaf66..c5fe566 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -462,11 +462,11 @@ add_text_event (TplLogStoreXml *self, TplEntity *sender; const gchar *body_str; gchar *avatar_token = NULL; - gchar *body; - gchar *timestamp; + gchar *body = NULL; + gchar *timestamp = NULL; gchar *contact_name = NULL; - gchar *contact_id; - gchar *event; + gchar *contact_id = NULL; + gchar *event = NULL; TpChannelTextMessageType msg_type; g_return_val_if_fail (error == NULL || *error == NULL, FALSE); |