[Pkg-maemo-commits] r47 ./libhildonmime/debian: * Merged with trunk branch.
Jonny Lamb
jonnylamb at jonnylamb.com
Thu Dec 27 08:50:55 UTC 2007
------------------------------------------------------------
revno: 47
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: libhildonmime
timestamp: Thu 2007-12-27 08:50:55 +0000
message:
* Merged with trunk branch.
modified:
ChangeLog
configure.in
debian/changelog
libhildonmime/hildon-mime-categories.c
libhildonmime/hildon-mime-open.c
libhildonmime/hildon-uri.c
------------------------------------------------------------
revno: 21.1.30
committer: richard
timestamp: Fri 2007-09-21 07:20:38 +0000
message:
Disable debug output.
modified:
ChangeLog
configure.in
debian/changelog
libhildonmime/hildon-mime-categories.c
libhildonmime/hildon-uri.c
------------------------------------------------------------
revno: 21.1.31
committer: richard
timestamp: Fri 2007-09-21 08:25:13 +0000
message:
Fix NB#66935.
modified:
ChangeLog
debian/changelog
libhildonmime/hildon-mime-open.c
------------------------------------------------------------
revno: 21.1.32
committer: martyn
timestamp: Fri 2007-09-21 16:22:06 +0000
message:
Release 1.10.0
modified:
ChangeLog
debian/changelog
------------------------------------------------------------
revno: 21.1.33
committer: martyn
timestamp: Mon 2007-10-29 14:43:51 +0000
message:
* configure.in:
* debian/changelog: Bump version.
* libhildonmime/hildon-uri.c: Stop processing actions when the
default is found, fixes NB#73548.
modified:
ChangeLog
configure.in
debian/changelog
libhildonmime/hildon-uri.c
------------------------------------------------------------
revno: 21.1.34
committer: martyn
timestamp: Wed 2007-10-31 11:57:43 +0000
message:
Release 1.10.1
modified:
ChangeLog
debian/changelog
-------------- next part --------------
=== modified file 'ChangeLog'
--- a/ChangeLog 2007-08-31 15:52:44 +0000
+++ b/ChangeLog 2007-10-31 11:57:43 +0000
@@ -1,3 +1,34 @@
+2007-10-31 Martyn Russell <martyn at imendio.com>
+
+ * Release 1.10.1.
+
+2007-10-29 Martyn Russell <martyn at imendio.com>
+
+ * configure.in:
+ * debian/changelog: Bump version.
+
+ * libhildonmime/hildon-uri.c: Stop processing actions when the
+ default is found, fixes NB#73548.
+
+2007-09-21 Richard Hult <richard at imendio.com>
+
+ * Release 1.10.0.
+
+2007-09-21 Richard Hult <richard at imendio.com>
+
+ * libhildonmime/hildon-mime-open.c: (mime_launch): Split up the
+ list of files and handle 256 at a time, to bypass the limitation
+ of message size in D-Bus. (The right solution would be to use an
+ array instead of appending, like we wanted to do quite a while ago
+ but couldn't because apps didn't want to change their side.)
+
+2007-09-21 Richard Hult <richard at imendio.com>
+
+ * configure.in: Bump version.
+
+ * libhildonmime/hildon-mime-categories.c (xdg_mime_shutdown):
+ * libhildonmime/hildon-uri.c: Disable debug output.
+
2007-08-31 Martyn Russell <martyn at imendio.com>
* Release 1.9.15.
=== modified file 'configure.in'
--- a/configure.in 2007-09-21 19:00:16 +0000
+++ b/configure.in 2007-12-27 08:50:55 +0000
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT(libhildonmime, 1.9.15)
+AC_INIT(libhildonmime, 1.10.1)
AC_CONFIG_SRCDIR(libhildonmime/hildon-uri.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-09-21 19:00:16 +0000
+++ b/debian/changelog 2007-12-27 08:50:55 +0000
@@ -1,4 +1,4 @@
-libhildonmime (1.9.15-1-1) UNRELEASED; urgency=low
+libhildonmime (1.10.1-1-1) UNRELEASED; urgency=low
[ Loic Minier ]
* Set Maintainer to Debian Maemo Maintainers; add myself to Uploaders.
@@ -26,6 +26,19 @@
-- Jonny Lamb <jonnylamb at jonnylamb.com> Fri, 21 Sep 2007 18:20:51 +0100
+libhildonmime (1.10.1-1) unstable; urgency=low
+
+ * Fixes: NB73548, Access to already freed memory in webshortcut settings
+
+ -- Martyn Russell <martyn at imendio.com> Wed, 31 Oct 2007 12:00:00 +0000
+
+libhildonmime (1.10.0-1) unstable; urgency=low
+
+ * Fixes: NB#70451, hildon_uri_get_default_action have too many output
+ * Fixes: NB#66935, File manager crashed while trying to access audio clips
+
+ -- Martyn Russell <martyn at imendio.com> Fri, 21 Sep 2007 17:20:00 +0100
+
libhildonmime (1.9.15-1) unstable; urgency=low
* Update default URI handler for mailto scheme to use old email engine.
=== modified file 'libhildonmime/hildon-mime-categories.c'
--- a/libhildonmime/hildon-mime-categories.c 2007-05-03 16:21:12 +0000
+++ b/libhildonmime/hildon-mime-categories.c 2007-09-21 07:20:38 +0000
@@ -480,8 +480,6 @@
static void
xdg_mime_shutdown (void)
{
- g_print ("*** shutdown\n");
-
/* FIXME: Need to make this (and the whole library) thread safe */
if (dir_time_list) {
xdg_dir_time_list_free (dir_time_list);
=== modified file 'libhildonmime/hildon-mime-open.c'
--- a/libhildonmime/hildon-mime-open.c 2007-08-31 14:03:40 +0000
+++ b/libhildonmime/hildon-mime-open.c 2007-09-21 08:25:13 +0000
@@ -271,20 +271,6 @@
return success;
}
-static void
-mime_launch_add_arg (const gchar *uri,
- DBusMessageIter *iter)
-{
- if (!g_utf8_validate (uri, -1, NULL)) {
- g_warning ("Invalid UTF-8 passed to hildon_mime_open\n");
- return;
- }
-
- dprint ("URI: '%s'", uri);
-
- dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &uri);
-}
-
static gboolean
mime_launch (DBusConnection *con,
AppEntry *entry)
@@ -297,6 +283,7 @@
gchar *object_path;
gchar *interface;
gboolean success = TRUE;
+ GSList *files = entry->files;
key = entry->service_name;
method = "mime_open";
@@ -318,32 +305,50 @@
dprint ("Activating service:'%s', object path:'%s', interface:'%s', method:'%s'",
service, object_path, interface, method);
- dprint ("Creating message for service: '%s'", service);
- msg = dbus_message_new_method_call (service, object_path, interface, method);
-
- if (msg) {
- dbus_message_set_no_reply (msg, TRUE);
- dbus_message_iter_init_append (msg, &iter);
-
- dprint ("Adding arguments:");
- g_slist_foreach (entry->files, (GFunc) mime_launch_add_arg, &iter);
-
- if (dbus_connection_send (con, msg, NULL) == TRUE) {
- dprint ("Sent message to service: '%s'", service);
- dbus_connection_flush (con);
-
- /* Update the task navigator */
- success = mime_launch_notify_task_navigator (con, service);
+ while (files) {
+ dprint ("Creating message for service: '%s'", service);
+ msg = dbus_message_new_method_call (service, object_path, interface, method);
+
+ if (msg) {
+ gint n_files = 0;
+
+ dbus_message_set_no_reply (msg, TRUE);
+ dbus_message_iter_init_append (msg, &iter);
+
+ dprint ("Adding arguments:");
+
+ while (n_files < 256 && files) {
+ const gchar *uri = files->data;
+
+ if (g_utf8_validate (uri, -1, NULL)) {
+ dprint ("URI: '%s'", uri);
+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &uri);
+ n_files++;
+ } else {
+ g_warning ("Invalid UTF-8 passed to hildon_mime_open\n");
+ }
+
+ files = files->next;
+ }
+
+ if (dbus_connection_send (con, msg, NULL) == TRUE) {
+ dprint ("Sent message to service: '%s'", service);
+ dbus_connection_flush (con);
+
+ /* Update the task navigator */
+ success = mime_launch_notify_task_navigator (con, service);
+ } else {
+ dprint ("Couldn't send message to service: '%s'", service);
+ success = FALSE;
+ }
+
+ dbus_message_unref (msg);
} else {
- dprint ("Couldn't send message to service: '%s'", service);
+ dprint ("Couldn't create msg with method: 'mime-open' to service: '%s'",
+ service);
success = FALSE;
+ break;
}
-
- dbus_message_unref (msg);
- } else {
- dprint ("Couldn't create msg with method: 'mime-open' to service: '%s'",
- service);
- success = FALSE;
}
g_free (service);
@@ -490,7 +495,6 @@
}
}
-
num_apps = g_hash_table_size (apps);
g_hash_table_foreach (apps, (GHFunc) mime_open_file_list_foreach, &list);
=== modified file 'libhildonmime/hildon-uri.c'
--- a/libhildonmime/hildon-uri.c 2007-08-31 14:03:40 +0000
+++ b/libhildonmime/hildon-uri.c 2007-10-29 14:43:51 +0000
@@ -61,7 +61,8 @@
#define APP_LAUNCH_BANNER_METHOD_PATH "/com/nokia/hildon/hdwm"
#define APP_LAUNCH_BANNER_METHOD "starting"
-#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
+/*#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");*/
+#define DEBUG_MSG(args)
/* The ID is the group name in the desktop file for this
* action, the domain is the translation domain used for the
@@ -1543,6 +1544,7 @@
g_slist_free1 (l);
actions = g_slist_prepend (actions, default_action);
+ break;
}
}
@@ -1635,6 +1637,7 @@
g_slist_free1 (l);
actions = g_slist_prepend (actions, default_action);
+ break;
}
}
More information about the Pkg-maemo-commits
mailing list