[maemo-commits] [maemo-commits] r9230 - in projects/haf/trunk/libosso: debian src

Mon Jan 22 18:10:41 EET 2007

Author: kihamala
Date: 2007-01-22 18:10:40 +0200 (Mon, 22 Jan 2007)
New Revision: 9230

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/libosso.h
   projects/haf/trunk/libosso/src/osso-application-init.c
Log:
tagging it


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================

--- projects/haf/trunk/libosso/debian/changelog	2007-01-22 15:59:44 UTC (rev 9229)
+++ projects/haf/trunk/libosso/debian/changelog	2007-01-22 16:10:40 UTC (rev 9230)
@@ -1,6 +1,5 @@
 libosso (2.0-1) unstable; urgency=low
 
-  * UNRELEASED
   * Branched the code (1.x branch is the maintenance branch).
   * Compilation fixes for the case that LIBOSSO_DEBUG is defined.
   * Const keyword fixes from Murray Cumming <murrayc at murrayc.com>.
@@ -19,9 +18,9 @@
   * The old API does not use muali filter anymore.
   * Removed unused API (as part of Hildon API cleanup): osso_tasknav_* and
     osso_application_initialize.
-  * (Contains some untested muali code.)
+  * (Contains some untested and experimental muali code.)
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 22 Jan 2007 18:00:35 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 22 Jan 2007 18:11:52 +0200
 
 libosso (1.20-1) unstable; urgency=low
 

Modified: projects/haf/trunk/libosso/src/libosso.h
===================================================================
--- projects/haf/trunk/libosso/src/libosso.h	2007-01-22 15:59:44 UTC (rev 9229)
+++ projects/haf/trunk/libosso/src/libosso.h	2007-01-22 16:10:40 UTC (rev 9230)
@@ -1356,79 +1356,6 @@
  */
 void osso_state_close(osso_context_t *osso, gint fd);
 
-#if 0  /* Hildon API cleanup */
-/** This function adds a mail to be displayed in the
- *      mail popup of the tasknavigator.
- *
- * @deprecated This function will be removed.
- *
- *      @param osso The osso library context returned by #osso_initialize
- *      @param id unique identifier for the mail
- *      @param subject the subject string of the email
- *      @param sender the email address of the sender of the mail
- *      @param attachment true iff the mail has an attatchment
- *      @param date the date the mail was received.
- *
- *
- *      @return #OSSO_OK on success, #OSSO_ERROR in case of an error,
- *              #OSSO_INVALID if a parameter is invalid.
- */
-osso_return_t osso_tasknav_mail_add(osso_context_t *osso, guint id,
-				    const gchar *subject, const gchar *sender,
-				    gboolean attachment, const gchar *date);
-
-/** This function removes an email message from the navigator.
- *
- * @deprecated This function will be removed.
- *
- *      @param osso The osso library context returned by #osso_initialize
- *      @param id unique identifier of the mail to be destroyed
- *
- *      @return #OSSO_OK on success, #OSSO_ERROR in case of an error,
- *              #OSSO_INVALID if a paramter is invalid.
- *
- *
- */
-osso_return_t osso_tasknav_mail_del(osso_context_t *osso, guint id);
-
-/** This function updates the outbox message count in the task
- *      navigator mail window.
- *
- * @deprecated This function will be removed.
- *
- *      @param osso The osso library context returned by #osso_initialize
- *      @param count New number of messages in outbox
- *
- *      @return #OSSO_OK on success, #OSSO_ERROR in case of an error,
- *              #OSSO_INVALID if a paramter is invalid.
- *
- *
- */
-osso_return_t osso_tasknav_mail_set_outbox_count(osso_context_t *osso,
-						 guint count);
-
-/** Osso initialisation routine for applications to call.
- *  This ensures that the environment variables are transferred
- *  correctly before the gtk_init();
- *
- * @deprecated This function will be removed, use osso_initialize() instead.
- * 
- * @param application The name that this application is known as. This is  
- * not the name that a user sees, but rather the name that other
- * applications use as an address to communicate with this program.
- * @param version The version string of the application. It mus be simply
- * comparable with strcmp().
- * @param cb The callback function to used when application is topped.
- * @param callback_data An arbitrary pointer to some application specific data
- *              to pass to the top callback
-*/
-osso_context_t * osso_application_initialize(const gchar *application,
-					     const gchar *version,
-					     osso_application_top_cb_f *cb,
-					     gpointer callback_data);
-#endif
-
-
 /*@}*/
 G_END_DECLS
 

Modified: projects/haf/trunk/libosso/src/osso-application-init.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-application-init.c	2007-01-22 15:59:44 UTC (rev 9229)
+++ projects/haf/trunk/libosso/src/osso-application-init.c	2007-01-22 16:10:40 UTC (rev 9230)
@@ -27,70 +27,6 @@
 #include "libosso.h"
 #include <assert.h>
 
-#if 0   /* Hildon API cleanup */
-static void _run_main_loop( void );
-
-
-osso_context_t * osso_application_initialize(const gchar *application,
-				 const gchar *version,
-                                 osso_application_top_cb_f *cb,
-                                 gpointer callback_data)
-{
-    osso_context_t *osso;
-    
-    if ( (osso = osso_initialize(application,version,TRUE,NULL)) == NULL)
-        return NULL;
-    
-    if (osso_application_set_top_cb(osso,
-				    cb,
-				    callback_data) != OSSO_OK)
-    {
-        osso_deinitialize(osso);
-        return NULL;
-    }
-        
-
-    _run_main_loop();
-    
-    
-    return osso;
-}
-
-static gboolean _rpc_run_ret_cb(gpointer data);
-static void _run_main_loop( void )
-{
-    GSource *to;
-    GMainLoop *loop = NULL;
-
-    
-    loop = g_main_loop_new(NULL,FALSE);
-    
-    to = g_timeout_source_new(500);
-
-/*    g_print("Loop = %p\n",(void *)loop);
-    g_print("Context = %p\n",((void **)loop)[0]);
-  */  
-    g_source_set_callback(to, _rpc_run_ret_cb, loop, NULL);
-
-    g_source_attach(to, NULL);
-
-    g_main_loop_run(loop);
-    
-    g_free(loop);
-}
-
-static gboolean _rpc_run_ret_cb(gpointer data)
-{
-    assert(data);
-
-
-/*    g_print("rpc_run_ret_cb Loop = %p\n",data);
-    g_print("rpc_run_ret_cb Context = %p\n",((void **)data)[0]);*/
-    g_main_loop_quit( (GMainLoop *)data);
-    return 0;
-}
-#endif
-
 const gchar * osso_application_name_get(osso_context_t *osso)
 {
 	if ( osso == NULL ) {


