Update License

2012 -> 2013

(Sync with the RSA)

Unlink kept image file when the handler is deleted

Change-Id: If8be7c4e5f7bd29278a27f40a87babe959757302

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a36083f..27d0e1f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-DLOG_TAG=\"LIVEBOX_VIEWER\"")
 ADD_DEFINITIONS("-DNDEBUG")
 #ADD_DEFINITIONS("-DFLOG")
-ADD_DEFINITIONS("-DMASTER_PKGNAME=\"com.samsung.data-provider-master\"")
+ADD_DEFINITIONS("-DMASTER_PKGNAME=\"data-provider-master\"")
 ADD_DEFINITIONS("-DINFO_SOCKET=\"/opt/usr/share/live_magazine/.live.socket\"")
 ADD_DEFINITIONS("-DCLIENT_SOCKET=\"/opt/usr/share/live_magazine/.client.socket\"")
 ADD_DEFINITIONS("-DSLAVE_SOCKET=\"/opt/usr/share/live_magazine/.slave.socket\"")

diff --git a/LICENSE b/LICENSE
index 27daa90..009765e 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Flora License 
 
-Version 1.0, May, 2012 
+Version 1.0, May, 2013 
 
 http://www.tizenopensource.org/license 
 

diff --git a/include/client.h b/include/client.h
index 873ae9d..f2eae82 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/conf.h b/include/conf.h
index 25b158d..98855a4 100644 (file)
--- a/include/conf.h
+++ b/include/conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/critical_log.h b/include/critical_log.h
index 070ac47..63f4a53 100644 (file)
--- a/include/critical_log.h
+++ b/include/critical_log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/debug.h b/include/debug.h
index 2d2748e..98d671c 100644 (file)
--- a/include/debug.h
+++ b/include/debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/desc_parser.h b/include/desc_parser.h
index 0bb5502..487ee7b 100644 (file)
--- a/include/desc_parser.h
+++ b/include/desc_parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/dlist.h b/include/dlist.h
index b4a5719..7085384 100644 (file)
--- a/include/dlist.h
+++ b/include/dlist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/fb.h b/include/fb.h
index 7491aa3..31da7c1 100644 (file)
--- a/include/fb.h
+++ b/include/fb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/livebox-viewer_PG.h b/include/livebox-viewer_PG.h
index 62077ae..d262be8 100644 (file)
--- a/include/livebox-viewer_PG.h
+++ b/include/livebox-viewer_PG.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/livebox.h b/include/livebox.h
index 400828d..5d26a30 100644 (file)
--- a/include/livebox.h
+++ b/include/livebox.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/livebox_internal.h b/include/livebox_internal.h
index 4a6b100..a329ba8 100644 (file)
--- a/include/livebox_internal.h
+++ b/include/livebox_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/master_rpc.h b/include/master_rpc.h
index e507c27..0e54a47 100644 (file)
--- a/include/master_rpc.h
+++ b/include/master_rpc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/util.h b/include/util.h
index 2c9275b..1d3f09e 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ extern double util_timestamp(void);
 extern const char *util_basename(const char *name);
 extern int util_validate_livebox_package(const char *pkgname);
 extern const char *util_uri_to_path(const char *uri);
+extern int util_unlink(const char *filename);
 
 #define SCHEMA_FILE    "file://"
 #define SCHEMA_PIXMAP  "pixmap://"

diff --git a/live.viewer/include/debug.h b/live.viewer/include/debug.h
index 2d2748e..98d671c 100644 (file)
--- a/live.viewer/include/debug.h
+++ b/live.viewer/include/debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/include/dlist.h b/live.viewer/include/dlist.h
index b4a5719..7085384 100644 (file)
--- a/live.viewer/include/dlist.h
+++ b/live.viewer/include/dlist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/include/lb.h b/live.viewer/include/lb.h
index d6ea8bc..14d90f9 100644 (file)
--- a/live.viewer/include/lb.h
+++ b/live.viewer/include/lb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/include/live_scroller.h b/live.viewer/include/live_scroller.h
index de7e77e..5758378 100644 (file)
--- a/live.viewer/include/live_scroller.h
+++ b/live.viewer/include/live_scroller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/include/main.h b/live.viewer/include/main.h
index 33f292f..b3d2032 100644 (file)
--- a/live.viewer/include/main.h
+++ b/live.viewer/include/main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/include/scroller.h b/live.viewer/include/scroller.h
index 41d6757..58cca5e 100644 (file)
--- a/live.viewer/include/scroller.h
+++ b/live.viewer/include/scroller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/include/util.h b/live.viewer/include/util.h
index bf99fb4..f4f5d68 100644 (file)
--- a/live.viewer/include/util.h
+++ b/live.viewer/include/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/res/live-viewer.edc b/live.viewer/res/live-viewer.edc
index f4d4242..2b95757 100644 (file)
--- a/live.viewer/res/live-viewer.edc
+++ b/live.viewer/res/live-viewer.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/src/dlist.c b/live.viewer/src/dlist.c
index 56ff060..78c76ba 100644 (file)
--- a/live.viewer/src/dlist.c
+++ b/live.viewer/src/dlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/src/lb.c b/live.viewer/src/lb.c
index cbe928b..fc1fe4d 100644 (file)
--- a/live.viewer/src/lb.c
+++ b/live.viewer/src/lb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/src/live_scroller.c b/live.viewer/src/live_scroller.c
index 4a23dd2..fc5cd60 100644 (file)
--- a/live.viewer/src/live_scroller.c
+++ b/live.viewer/src/live_scroller.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/src/main.c b/live.viewer/src/main.c
index 362cf3f..e7d9bd5 100644 (file)
--- a/live.viewer/src/main.c
+++ b/live.viewer/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/src/scroller.c b/live.viewer/src/scroller.c
index 8eca311..243ae14 100644 (file)
--- a/live.viewer/src/scroller.c
+++ b/live.viewer/src/scroller.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/live.viewer/src/util.c b/live.viewer/src/util.c
index 73bca58..29b13f6 100644 (file)
--- a/live.viewer/src/util.c
+++ b/live.viewer/src/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
index 8dd226c..994c068 100644 (file)
--- a/packaging/liblivebox-viewer.spec
+++ b/packaging/liblivebox-viewer.spec
@@ -1,8 +1,8 @@
 Name: liblivebox-viewer
 Summary: Library for developing the application.
-Version: 0.10.2
+Version: 0.10.3
 Release: 1
-Group: framework/livebox
+Group: HomeTF/Livebox
 License: Flora License
 Source0: %{name}-%{version}.tar.gz
 BuildRequires: cmake, gettext-tools, coreutils

diff --git a/src/client.c b/src/client.c
index e17073b..3a483fc 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/critical_log.c b/src/critical_log.c
index 91610f9..d97521d 100644 (file)
--- a/src/critical_log.c
+++ b/src/critical_log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/desc_parser.c b/src/desc_parser.c
index d29fdea..69b70d2 100644 (file)
--- a/src/desc_parser.c
+++ b/src/desc_parser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/dlist.c b/src/dlist.c
index 56ff060..78c76ba 100644 (file)
--- a/src/dlist.c
+++ b/src/dlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/fb.c b/src/fb.c
index ebdeb6f..d1fe2de 100644 (file)
--- a/src/fb.c
+++ b/src/fb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/livebox.c b/src/livebox.c
index 0303aa1..826cf4b 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -2538,6 +2538,9 @@ struct livebox *lb_unref(struct livebox *handler)
        if (handler->refcnt > 0)
                return handler;
 
+       if (handler->filename)
+               util_unlink(handler->filename);
+
        dlist_remove_data(s_info.livebox_list, handler);
 
        handler->state = DESTROYED;

diff --git a/src/master_rpc.c b/src/master_rpc.c
index f9a03cc..6e80932 100644 (file)
--- a/src/master_rpc.c
+++ b/src/master_rpc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/util.c b/src/util.c
index b7ab93f..b0e7181 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -139,4 +139,31 @@ const char *util_uri_to_path(const char *uri)
        return uri + len;
 }
 
+int util_unlink(const char *filename)
+{
+       char *descfile;
+       int desclen;
+       int ret;
+
+       desclen = strlen(filename) + 6; /* .desc */
+       descfile = malloc(desclen);
+       if (!descfile) {
+               ErrPrint("Heap: %s\n", strerror(errno));
+               return LB_STATUS_ERROR_MEMORY;
+       }
+
+       ret = snprintf(descfile, desclen, "%s.desc", filename);
+       if (ret < 0) {
+               ErrPrint("Error: %s\n", strerror(errno));
+               free(descfile);
+               return LB_STATUS_ERROR_FAULT;
+       }
+
+       (void)unlink(descfile);
+       free(descfile);
+       (void)unlink(filename);
+
+       return LB_STATUS_SUCCESS;
+}
+
 /* End of a file */