aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-05-18 20:52:09 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-05-18 21:01:04 +0800
commitec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d (patch)
treedc1a386655b119239f54de53277eb871df65609d
parentc0dcaede2b8a47ae0da897cc18f2899d6a649433 (diff)
downloadgsoc2013-empathy-ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d.tar
gsoc2013-empathy-ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d.tar.gz
gsoc2013-empathy-ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d.tar.bz2
gsoc2013-empathy-ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d.tar.lz
gsoc2013-empathy-ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d.tar.xz
gsoc2013-empathy-ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d.tar.zst
gsoc2013-empathy-ec20fb7ff4bee998e5ea0ceb6b6670858d21fb1d.zip
empathy-utils: fix coding style and update FSF address
-rw-r--r--libempathy/empathy-utils.c12
-rw-r--r--libempathy/empathy-utils.h6
2 files changed, 9 insertions, 9 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 210c35048..c0d4f12e4 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* Authors: Richard Hult <richard@imendio.com>
* Martyn Russell <martyn@imendio.com>
@@ -140,7 +140,7 @@ empathy_xml_validate (xmlDoc *doc,
}
xmlNodePtr
-empathy_xml_node_get_child (xmlNodePtr node,
+empathy_xml_node_get_child (xmlNodePtr node,
const gchar *child_name)
{
xmlNodePtr l;
@@ -158,7 +158,7 @@ empathy_xml_node_get_child (xmlNodePtr node,
}
xmlChar *
-empathy_xml_node_get_child_content (xmlNodePtr node,
+empathy_xml_node_get_child_content (xmlNodePtr node,
const gchar *child_name)
{
xmlNodePtr l;
@@ -175,7 +175,7 @@ empathy_xml_node_get_child_content (xmlNodePtr node,
}
xmlNodePtr
-empathy_xml_node_find_child_prop_value (xmlNodePtr node,
+empathy_xml_node_find_child_prop_value (xmlNodePtr node,
const gchar *prop_name,
const gchar *prop_value)
{
@@ -373,7 +373,7 @@ empathy_check_available_state (void)
if (presence != MC_PRESENCE_AVAILABLE &&
presence != MC_PRESENCE_UNSET) {
- return FALSE;
+ return FALSE;
}
return TRUE;
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index e6bcfebfc..0b056b942 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* Authors: Richard Hult <richard@imendio.com>
* Martyn Russell <martyn@imendio.com>
@@ -37,7 +37,7 @@
#include "empathy-contact.h"
-#define EMPATHY_GET_PRIV(obj,type) ((type##Priv*) ((type*)obj)->priv)
+#define EMPATHY_GET_PRIV(obj,type) ((type##Priv *) ((type *) obj)->priv)
#define EMP_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
G_BEGIN_DECLS