r4293 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2008-04-01 21:53:59 +0200 (Tue, 01 Apr 2008)
New Revision: 4293

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
Log:
2008-04-01  Thomas Wood  <thomas at openedhand.com>

	* src/sms-contacts.c: (openmoko_contacts_util_dial_number):
	* src/sms-utils.c:

	Remove functions copied from libhito which now conflict with built in
	version of libhito.


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-01 19:46:30 UTC (rev 4292)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-01 19:53:59 UTC (rev 4293)
@@ -1,5 +1,13 @@
 2008-04-01  Thomas Wood  <thomas at openedhand.com>
 
+	* src/sms-contacts.c: (openmoko_contacts_util_dial_number):
+	* src/sms-utils.c:
+
+	Remove functions copied from libhito which now conflict with built in
+	version of libhito.
+
+2008-04-01  Thomas Wood  <thomas at openedhand.com>
+
 	* configure.ac:
 	* src/Makefile.am:
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c	2008-04-01 19:46:30 UTC (rev 4292)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c	2008-04-01 19:53:59 UTC (rev 4293)
@@ -90,34 +90,6 @@
   }
 }
 
-
-/* hito_vcard_attribute_get_type() taken from hito-vcard-util.c
- * Copyright 2007 OpenedHand Ltd, licensed under GPL */
-gchar*
-hito_vcard_attribute_get_type (EVCardAttribute *attr)
-{
-  GList *list, *l;
-  gchar *result = NULL;
-  list = e_vcard_attribute_get_param (attr, "TYPE");
-
-  for (l = list; l; l = g_list_next (l))
-  {
-    if (result)
-    {
-      gchar *old_result = result;
-      result = g_strconcat (l->data, ";", old_result, NULL);
-      g_free (old_result);
-    }
-    else
-    {
-      result = g_strdup (l->data);
-    }
-  }
-
-  return result;
-}
-
-
 static void
 on_dial_number_clicked (GtkWidget *eb, GdkEventButton *event, GtkDialog *dialog)
 {

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c	2008-04-01 19:46:30 UTC (rev 4292)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c	2008-04-01 19:53:59 UTC (rev 4293)
@@ -26,59 +26,6 @@
 #  include <config.h>
 #endif
 
-/* Following two functions taken from contacts hito branch, written by
- * Ross Burton, copyright OpenedHand 2007
- */
-GList *
-hito_vcard_get_named_attributes (EVCard *contact, const char *name)
-{
-  GList *attrs = NULL, *l;
-
-  g_return_val_if_fail (E_IS_VCARD (contact), NULL);
-  g_return_val_if_fail (name != NULL, NULL);
-
-  for (l = e_vcard_get_attributes (E_VCARD (contact)); l; l = l->next)
-  {
-    EVCardAttribute *attr;
-    const char *n;
-
-    attr = (EVCardAttribute *) l->data;
-    n = e_vcard_attribute_get_name (attr);
-
-    if (strcmp (n, name) == 0)
-      attrs = g_list_prepend (attrs, attr);
-  }
-
-  return g_list_reverse (attrs);
-}
-
-/*
- * load the attribute value, returning a newly allocated semicolon seperated
- * string for multivalue attributes
- */
-gchar*
-hito_vcard_attribute_get_value_string (EVCardAttribute *attr)
-{
-  gchar *attr_value = NULL;
-  GList *l;
-  l = e_vcard_attribute_get_values (attr);
-  if (l)
-  {
-    attr_value = g_strdup (l->data);
-
-    while ((l = g_list_next (l)))
-    {
-      gchar *old = attr_value;
-      if (old)
-        attr_value = g_strdup_printf ("%s; %s", old, (gchar*) l->data);
-      else
-        attr_value = g_strdup (l->data);
-      g_free (old);
-    }
-  }
-  return attr_value;
-}
-
 void
 sms_clear_combo_box_text (GtkComboBox *combo)
 {