[meego-commits] 9034: Changes to Trunk:Handset/voicecallhistory

[raji]

Hi,
I have made the following changes to voicecallhistory in project Trunk:Handset. Please review and accept ASAP.

Thank You,
raji

[This message was auto-generated]

---

Request #9034:

  submit:   devel:ux:handset/voicecallhistory(r11) -> Trunk:Handset/voicecallhistory


Message:
    Fix for BMC#7542

State:   new          2010-10-28T13:59:17 raji
Comment: None



changes files:
--------------
--- voicecallhistory.changes
+++ voicecallhistory.changes
@@ -0,0 +1,3 @@
+* Tue Oct 26 2010 Raji Bommaraju <Rajyalakshmi.Bommaraju at intel.com> - 0.1.5
+Fix for BMC#7542, ofono dbus interface disappears when callhistory is installed.Due to mismatch with ofono api, introspection fails for callhistory interface,causing ofono to disappear on the system bus. 
+

old:
----
  voicecallhistory-0.1.4.tar.bz2

new:
----
  voicecallhistory-0.1.5.tar.bz2

spec files:
-----------
--- voicecallhistory.spec
+++ voicecallhistory.spec
@@ -7,7 +7,7 @@
 
 Name:       voicecallhistory
 Summary:    voice call history logging plugin for ofono
-Version:    0.1.4
+Version:    0.1.5
 Release:    1
 Group:      Applications/System
 License:    GPLv2

other changes:
--------------

++++++ voicecallhistory-0.1.4.tar.bz2 -> voicecallhistory-0.1.5.tar.bz2
--- configure.ac
+++ configure.ac
@@ -2,7 +2,7 @@
 
 m4_define(callhistory_version_major, 0)
 m4_define(callhistory_version_minor, 1)
-m4_define(callhistory_version_micro, 4)
+m4_define(callhistory_version_micro, 5)
 
 m4_define([callhistory_version],
           [callhistory_version_major.callhistory_version_minor.callhistory_version_micro])
--- src/gdbus.h
+++ src/gdbus.h
@@ -40,6 +40,9 @@
 DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name,
 							DBusError *error);
 
+DBusConnection *g_dbus_setup_private(DBusBusType type, const char *name,
+							DBusError *error);
+
 gboolean g_dbus_request_name(DBusConnection *connection, const char *name,
 							DBusError *error);
 
@@ -52,6 +55,13 @@
 typedef DBusMessage * (* GDBusMethodFunction) (DBusConnection *connection,
 					DBusMessage *message, void *user_data);
 
+typedef guint32 GDBusPendingReply;
+
+typedef void (* GDBusSecurityFunction) (DBusConnection *connection,
+						const char *action,
+						gboolean interaction,
+						GDBusPendingReply pending);
+
 typedef enum {
 	G_DBUS_METHOD_FLAG_DEPRECATED = (1 << 0),
 	G_DBUS_METHOD_FLAG_NOREPLY    = (1 << 1),
@@ -66,12 +76,19 @@
 	G_DBUS_PROPERTY_FLAG_DEPRECATED = (1 << 0),
 } GDBusPropertyFlags;
 
+typedef enum {
+	G_DBUS_SECURITY_FLAG_DEPRECATED        = (1 << 0),
+	G_DBUS_SECURITY_FLAG_BUILTIN           = (1 << 1),
+	G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION = (1 << 2),
+} GDBusSecurityFlags;
+
 typedef struct {
 	const char *name;
 	const char *signature;
 	const char *reply;
 	GDBusMethodFunction function;
 	GDBusMethodFlags flags;
+	unsigned int privilege;
 } GDBusMethodTable;
 
 typedef struct {
@@ -86,18 +103,39 @@
 	GDBusPropertyFlags flags;
 } GDBusPropertyTable;
 
+typedef struct {
+	unsigned int privilege;
+	const char *action;
+	GDBusSecurityFlags flags;
+	GDBusSecurityFunction function;
+} GDBusSecurityTable;
+
 gboolean g_dbus_register_interface(DBusConnection *connection,
 					const char *path, const char *name,
-					GDBusMethodTable *methods,
-					GDBusSignalTable *signals,
-					GDBusPropertyTable *properties,
+					const GDBusMethodTable *methods,
+					const GDBusSignalTable *signals,
+					const GDBusPropertyTable *properties,
 					void *user_data,
 					GDBusDestroyFunction destroy);
 gboolean g_dbus_unregister_interface(DBusConnection *connection,
 					const char *path, const char *name);
 
+gboolean g_dbus_register_security(const GDBusSecurityTable *security);
+gboolean g_dbus_unregister_security(const GDBusSecurityTable *security);
+
+void g_dbus_pending_success(DBusConnection *connection,
+					GDBusPendingReply pending);
+void g_dbus_pending_error(DBusConnection *connection,
+				GDBusPendingReply pending,
+				const char *name, const char *format, ...)
+					__attribute__((format(printf, 4, 5)));
+void g_dbus_pending_error_valist(DBusConnection *connection,
+				GDBusPendingReply pending, const char *name,
+					const char *format, va_list args);
+
 DBusMessage *g_dbus_create_error(DBusMessage *message, const char *name,
-						const char *format, ...);
+						const char *format, ...)
+					__attribute__((format(printf, 3, 4)));
 DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name,
 					const char *format, va_list args);
 DBusMessage *g_dbus_create_reply(DBusMessage *message, int type, ...);
@@ -125,8 +163,10 @@
 				GDBusWatchFunction function,
 				void *user_data, GDBusDestroyFunction destroy);
 guint g_dbus_add_signal_watch(DBusConnection *connection,
-				const char *rule, GDBusSignalFunction function,
-				void *user_data, GDBusDestroyFunction destroy);
+				const char *sender, const char *path,
+				const char *interface, const char *member,
+				GDBusSignalFunction function, void *user_data,
+				GDBusDestroyFunction destroy);
 gboolean g_dbus_remove_watch(DBusConnection *connection, guint tag);
 void g_dbus_remove_all_watches(DBusConnection *connection);
 
--- src/history_plugin.c
+++ src/history_plugin.c
@@ -600,8 +600,8 @@
 }
 
 static GDBusMethodTable call_history_methods[] = {
-	{ "GetVoiceHistory", "", "a(usqii)", call_history_get_voice_history },
-	{ "SetVoiceHistoryRead", "", "", call_history_set_voice_history_read },
+	{ "SetVoiceHistoryRead", "", "", call_history_set_voice_history_read ,G_DBUS_METHOD_FLAG_ASYNC,0},
+	{ "GetVoiceHistory", "", "a(usqii)", call_history_get_voice_history ,G_DBUS_METHOD_FLAG_ASYNC,0},
 	{ },
 };
 

++++++ voicecallhistory.yaml
--- voicecallhistory.yaml
+++ voicecallhistory.yaml
@@ -1,6 +1,6 @@
 Name: voicecallhistory
 Summary: voice call history logging plugin for ofono
-Version: 0.1.4
+Version: 0.1.5
 Release: 1
 Group: Applications/System
 License: GPLv2