From 73c14a4b3bcb11810ea3e23eeebb1330f83d03a4 Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Sat, 16 Mar 2013 01:04:08 +0900
Subject: [PATCH] merge with master

---
 packaging/org.tizen.memo.spec | 2 +-
 src/memo_text_editor.c        | 8 +++++---
 src/memo_ug.c                 | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packaging/org.tizen.memo.spec b/packaging/org.tizen.memo.spec
index f86e2fc..de2fe56 100644
--- a/packaging/org.tizen.memo.spec
+++ b/packaging/org.tizen.memo.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/apps/m/memo memo 0.1.5 27cb9ac9efc61361edf86770614768505e688a17
 Name:       org.tizen.memo
 Summary:    Memo displays the time as text
-Version:    0.2.9
+Version:    0.2.10
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Apache
diff --git a/src/memo_text_editor.c b/src/memo_text_editor.c
index 8ee9a6f..52f0a71 100644
--- a/src/memo_text_editor.c
+++ b/src/memo_text_editor.c
@@ -284,22 +284,24 @@ static void _on_entry_content_change(void *data, Evas_Object *obj, void *event_i
         }
     }
     te->cb(te->data, "savable", (void *)(te->savable?1:0));
-
+#if 0
     /* after paste/cut, the font size/color information may be cleared */
     snprintf(te->buf, MEMO_BUFFER_SIZE, "<font_size=%d><color=#%02x%02x%02x>",
         te->record->font_size, color[2], color[1], color[0]);
     if (text[0] == '\0') { /* no content */
-        //elm_entry_entry_insert(te->entry, te->buf);
+        elm_entry_entry_insert(te->entry, te->buf);
     } else if (text[0] != '<') { /* insert font information */
         elm_entry_cursor_begin_set(te->entry);
-        //elm_entry_entry_insert(te->entry, te->buf);
+        elm_entry_entry_insert(te->entry, te->buf);
         elm_entry_cursor_end_set(te->entry);
     }
+
     if (!strstr(text, "</color></font_size>"))
     {
         elm_entry_cursor_end_set(te->entry);
         elm_entry_entry_insert(te->entry, "</color></font_size>");
     }
+#endif
     SFREE(content);
     MEMO_FUN_END();
 }
diff --git a/src/memo_ug.c b/src/memo_ug.c
index e366a5d..6c4ed47 100644
--- a/src/memo_ug.c
+++ b/src/memo_ug.c
@@ -34,7 +34,7 @@ static GString *get_shared_text(Eina_List *list)
 
     EINA_LIST_FOREACH(list, l, md) {
         if ((md != NULL) && !(md->has_doodle)) {
-            g_string_append_printf(buf, "%s", md->content);
+            g_string_append_printf(buf, "%s\n", md->content);
         }
     }
 
-- 
2.7.4