diff options
| -rw-r--r-- | salut/Makefile.am | 3 | ||||
| -rw-r--r-- | salut/util.h | 29 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/salut-util.c | 1 | ||||
| -rw-r--r-- | src/salut-util.h | 4 |
5 files changed, 33 insertions, 5 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am index d2878b10..f8858fe5 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -10,6 +10,7 @@ salutinclude_HEADERS = \ capabilities-set.h \ caps-channel-manager.h \ capabilities.h \ - sidecar.h + sidecar.h \ + util.h endif diff --git a/salut/util.h b/salut/util.h new file mode 100644 index 00000000..5746c5b2 --- /dev/null +++ b/salut/util.h @@ -0,0 +1,29 @@ +/* + * util.h - Headers for Salut utility functions + * Copyright (C) 2011 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef SALUT_UTIL_H +#define SALUT_UTIL_H + +#include <wocky/wocky-stanza.h> +#include <wocky/wocky-session.h> + +void salut_send_ll_pep_event (WockySession *session, + WockyStanza *stanza); + +#endif /* SALUT_UTIL_H */ diff --git a/src/Makefile.am b/src/Makefile.am index 2b21eac3..d9d90b14 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,6 +81,7 @@ CORE_SOURCES = \ salut-tubes-channel.c \ salut-util.h \ salut-util.c \ + $(top_srcdir)/salut/util.h \ debug.c \ debug.h \ protocol.c \ diff --git a/src/salut-util.c b/src/salut-util.c index 156a8c13..98c37631 100644 --- a/src/salut-util.c +++ b/src/salut-util.c @@ -19,6 +19,7 @@ */ #include "salut-util.h" +#include "util.h" #include <stdlib.h> #include <string.h> diff --git a/src/salut-util.h b/src/salut-util.h index 99aee91c..17fca019 100644 --- a/src/salut-util.h +++ b/src/salut-util.h @@ -24,7 +24,6 @@ #include <glib.h> #include <glib-object.h> #include <wocky/wocky-stanza.h> -#include <wocky/wocky-session.h> /* Mapping a XMPP node with a GHashTable */ GHashTable *salut_wocky_node_extract_properties (WockyNode *node, @@ -33,7 +32,4 @@ void salut_wocky_node_add_children_from_properties (WockyNode *node, GHashTable *properties, const gchar *prop); gchar *salut_generate_id (void); -void salut_send_ll_pep_event (WockySession *session, - WockyStanza *stanza); - #endif /* __SALUT_UTIL_H__ */ |