Use double quotes for all internal headers

[empathy.git] / libempathy-gtk / empathy-contactinfo-utils.c

diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index b995297b0f0e8fa0fa24c436ab4a28e392994f03..fcf06194330a536ecf1ce8929f2aed27fe2df844 100644 (file)
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -20,17 +20,12 @@
  *          Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-request-util.h>
+#include "libempathy/empathy-time.h"
+#include "libempathy/empathy-request-util.h"
 
 #include "empathy-contactinfo-utils.h"
 #include "empathy-string-parser.h"
@@ -213,19 +208,23 @@ build_parameters_string (GStrv parameters)
 
 char *
 empathy_contact_info_field_label (const char *field_name,
-    GStrv parameters)
+    GStrv parameters,
+    gboolean show_parameters)
 {
   char *ret;
   const char *title;
-  char *join = build_parameters_string (parameters);
+  char *join = NULL;
 
   if (!empathy_contact_info_lookup_field (field_name, &title, NULL))
     return NULL;
 
+  if (show_parameters)
+    join = build_parameters_string (parameters);
+
   if (join != NULL)
-    ret = g_strdup_printf ("%s (%s):", title, join);
+    ret = g_strdup_printf ("%s (%s)", title, join);
   else
-    ret = g_strdup_printf ("%s:", title);
+    ret = g_strdup_printf ("%s", title);
 
   g_free (join);