[Pkg-maemo-commits] r353 ./hildon-fm/debian: * Merge with trunk branch.

Jonny Lamb jonnylamb at jonnylamb.com
Tue Jul 24 13:39:46 UTC 2007


------------------------------------------------------------
revno: 353
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-fm
timestamp: Tue 2007-07-24 14:39:46 +0100
message:
  * Merge with trunk branch.
added:
  hildon-fm/hildon-file-system-storage-dialog.c
  hildon-fm/hildon-file-system-storage-dialog.h
modified:
  ChangeLog
  configure.ac
  debian/changelog
  hildon-fm/Makefile.am
  hildon-fm/hildon-file-chooser-dialog.c
  hildon-fm/hildon-file-chooser-dialog.h
  hildon-fm/hildon-file-selection.c
  hildon-fm/hildon-file-system-model.c
  hildon-fm/hildon-file-system-model.h
  hildon-fm/hildon-file-system-private.c
  hildon-fm/hildon-file-system-root.c
  hildon-fm/hildon-file-system-settings.c
  hildon-fm/hildon-file-system-settings.h
  hildon-fm/hildon-file-system-upnp.c
  hildon-fm/hildon-file-system-voldev.c
  hildon-fm/t.c
    ------------------------------------------------------------
    revno: 320.1.28
    merged: vcs-imports at canonical.com-20070523154735-hpw63isjw1dndcyx
    committer: marivoll
    timestamp: Wed 2007-05-23 15:47:35 +0000
    message:
      	* hildon-fm/hildon-file-system-voldev.c
      	(hildon_file_system_voldev_volumes_changed): Translate Gnome icon
      	names to Hildon icons, as a 'temporary' measure.
    ------------------------------------------------------------
    revno: 320.1.29
    merged: vcs-imports at canonical.com-20070523154837-ib5ae1obo4qxo6dw
    committer: marivoll
    timestamp: Wed 2007-05-23 15:48:37 +0000
    message:
      	* hildon-fm/hildon-file-system-root.c
      	(hildon_file_system_root_create_child_location): Also accept
      	direct children of "file:///media/usb/".
    ------------------------------------------------------------
    revno: 320.1.30
    merged: vcs-imports at canonical.com-20070523171158-0zrihpnku7661yyp
    committer: marivoll
    timestamp: Wed 2007-05-23 17:11:58 +0000
    message:
      	* hildon-fm/hildon-file-system-voldev.c
      	(hildon_file_system_voldev_volumes_changed): Translate Gnome icon
      	names to Hildon icons, as a 'temporary' measure.
    ------------------------------------------------------------
    revno: 320.1.31
    merged: vcs-imports at canonical.com-20070523171342-4w21uijodf77n2ol
    committer: marivoll
    timestamp: Wed 2007-05-23 17:13:42 +0000
    message:
      	* hildon-fm/hildon-file-system-model.h,
      	hildon-fm/hildon-file-system-model.c
      	(HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_DRIVE): New.
    ------------------------------------------------------------
    revno: 320.1.32
    merged: vcs-imports at canonical.com-20070523172937-shtgxrh3rz0upw4h
    committer: marivoll
    timestamp: Wed 2007-05-23 17:29:37 +0000
    message:
      	* hildon-fm/hildon-file-selection.c (HildonFileSelectionPrivate):
      	Added fourth view for the "Repair" button.
      	(get_view_to_be_displayed): Select the "Repair" view for drives.
      	(repair_button_clicked): New (does nothing interesting for now).
      	(hildon_file_selection_init): Construct "Repair" view.
    ------------------------------------------------------------
    revno: 320.1.33
    merged: vcs-imports at canonical.com-20070523174028-g2guib03516ygoap
    committer: marivoll
    timestamp: Wed 2007-05-23 17:40:28 +0000
    message:
      	Released 1.9.24
    ------------------------------------------------------------
    revno: 320.1.34
    merged: vcs-imports at canonical.com-20070524145754-wmpz9ix76v7sadmc
    committer: marivoll
    timestamp: Thu 2007-05-24 14:57:54 +0000
    message:
      	* hildon-fm/hildon-file-system-voldev.c
      	(hildon_file_system_voldev_get_extra_info): New, return the device
      	path.
      	(hildon_file_system_voldev_class_init): Install it.
    ------------------------------------------------------------
    revno: 320.1.35
    merged: vcs-imports at canonical.com-20070524145833-w0tjefjiuglwb8m4
    committer: marivoll
    timestamp: Thu 2007-05-24 14:58:33 +0000
    message:
      Include device path in debugging output.
    ------------------------------------------------------------
    revno: 320.1.36
    merged: vcs-imports at canonical.com-20070524145946-3n4iqvdjy1twgkg5
    committer: marivoll
    timestamp: Thu 2007-05-24 14:59:46 +0000
    message:
      libhildonfm (1:1.9.25) unstable; urgency=low
      
        * Return device path as the "extra info" for GnomeVFS volumes and
          drives.
      
       -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 24 May 2007 15:49:35 +0300
    ------------------------------------------------------------
    revno: 320.1.37
    merged: vcs-imports at canonical.com-20070524153037-07nf4qp03lbuwy2e
    committer: marivoll
    timestamp: Thu 2007-05-24 15:30:37 +0000
    message:
      	* hildon-fm/hildon-file-system-upnp.c
      	(hildon_file_system_upnp_create_child_location): Set basepath of
      	child (N58259).  Thanks to Martyn Russel!
    ------------------------------------------------------------
    revno: 320.1.38
    merged: vcs-imports at canonical.com-20070524153057-upsx2873e1p3mdbv
    committer: marivoll
    timestamp: Thu 2007-05-24 15:30:57 +0000
    message:
      (no message)
    ------------------------------------------------------------
    revno: 320.1.39
    merged: vcs-imports at canonical.com-20070525142608-t73v4325497y8wlw
    committer: marivoll
    timestamp: Fri 2007-05-25 14:26:08 +0000
    message:
      	* hildon-fm/hildon-file-selection.c (trigger_repair): New.
      	(repair_button_clicked): Call it.
    ------------------------------------------------------------
    revno: 320.1.40
    merged: vcs-imports at canonical.com-20070525155052-5j9jyfpcj13hurx0
    committer: marivoll
    timestamp: Fri 2007-05-25 15:50:52 +0000
    message:
      	* hildon-fm/hildon-file-system-private.c (translate_special_name): New.
      	(_hildon_file_system_create_file_name): Use it.
    ------------------------------------------------------------
    revno: 320.1.41
    merged: vcs-imports at canonical.com-20070525155152-6bcc1oxo7ifum1v3
    committer: marivoll
    timestamp: Fri 2007-05-25 15:51:52 +0000
    message:
      (no message)
    ------------------------------------------------------------
    revno: 320.1.42
    merged: vcs-imports at canonical.com-20070528081443-umlvdmur2t7env9i
    committer: marivoll
    timestamp: Mon 2007-05-28 08:14:43 +0000
    message:
      	* hildon-fm/hildon-file-system-settings.h,
      	hildon-fm/hildon-file-system-settings.c,
      	hildon-fm/hildon-file-system-model.c:
      	(_hildon_file_system_prepare_banner,
      	_hildon_file_system_cancel_banner): Removed.  Removed all callers.
    ------------------------------------------------------------
    revno: 320.1.43
    merged: vcs-imports at canonical.com-20070528103351-ycrr6nx9vclgqup7
    committer: marivoll
    timestamp: Mon 2007-05-28 10:33:51 +0000
    message:
      	Released 1.9.26
    ------------------------------------------------------------
    revno: 320.1.44
    merged: vcs-imports at canonical.com-20070531102727-54bfnftb7aajeze7
    committer: marivoll
    timestamp: Thu 2007-05-31 10:27:27 +0000
    message:
      	* hildon-fm/hildon-file-system-voldev.c (capitalize_ascii_string,
      	beautify_mmc_name): New.
      	(hildon_file_system_voldev_volumes_changed): Use them to hack the
      	display name of memory cards (N33701).
    ------------------------------------------------------------
    revno: 320.1.45
    merged: vcs-imports at canonical.com-20070531144457-3hag14c2abxekxmb
    committer: marivoll
    timestamp: Thu 2007-05-31 14:44:57 +0000
    message:
      	* hildon-fm/hildon-file-system-voldev.c
      	(capitalize_and_remove_trailing_spaces, beautify_mmc_name): New.
      	(hildon_file_system_voldev_volumes_changed): Use them to hack the
      	display name of memory cards (N33701).
    ------------------------------------------------------------
    revno: 320.1.46
    merged: vcs-imports at canonical.com-20070531144550-vcob4bw1pymdh0tt
    committer: marivoll
    timestamp: Thu 2007-05-31 14:45:50 +0000
    message:
      (no message)
    ------------------------------------------------------------
    revno: 320.1.47
    merged: vcs-imports at canonical.com-20070601094640-5adfo9djzv8lgt74
    committer: marivoll
    timestamp: Fri 2007-06-01 09:46:40 +0000
    message:
      	* hildon-fm/hildon-file-selection.c (trigger_repair): Pass address
      	of pointers to dbus_message_append_args as required, not pointers
      	themselves.  How unobvious.
    ------------------------------------------------------------
    revno: 320.1.48
    merged: vcs-imports at canonical.com-20070601094704-mcr1fc978354bads
    committer: marivoll
    timestamp: Fri 2007-06-01 09:47:04 +0000
    message:
      (no message)
    ------------------------------------------------------------
    revno: 320.1.49
    merged: vcs-imports at canonical.com-20070604072756-cqev2xsxmz430e65
    committer: marivoll
    timestamp: Mon 2007-06-04 07:27:56 +0000
    message:
      	* hildon-fm/hildon-file-chooser-dialog.c,
      	hildon-fm/hildon-file-chooser-dialog.h (sync_extensions_combo,
      	extension_changed,
      	hildon_file_chooser_dialog_add_extensions_combo): New.
    ------------------------------------------------------------
    revno: 320.1.50
    merged: vcs-imports at canonical.com-20070604073531-6bd3fhjz2fx39mv7
    committer: marivoll
    timestamp: Mon 2007-06-04 07:35:31 +0000
    message:
      	Released 1.9.27
    ------------------------------------------------------------
    revno: 320.1.51
    merged: vcs-imports at canonical.com-20070604080836-leut81e8d65a80la
    committer: marivoll
    timestamp: Mon 2007-06-04 08:08:36 +0000
    message:
      	* hildon-fm/hildon-file-chooser-dialog.h,
      	hildon-fm/hildon-file-chooser-dialog.c
      	(hildon_file_chooser_dialog_get_extension,
      	hildon_file_chooser_dialog_set_extension): New.
    ------------------------------------------------------------
    revno: 320.1.52
    merged: vcs-imports at canonical.com-20070604101946-vfwyli8eej8dhtbl
    committer: marivoll
    timestamp: Mon 2007-06-04 10:19:46 +0000
    message:
      	Released 1.9.28
    ------------------------------------------------------------
    revno: 320.1.53
    merged: vcs-imports at canonical.com-20070607133310-zbr2xjnh191o6xxq
    committer: marivoll
    timestamp: Thu 2007-06-07 13:33:10 +0000
    message:
      	* hildon-fm/hildon-file-system-root.c
      	(hildon_file_system_root_get_folder): Set file_system of handle so
      	that cancelling works (N59441).
    ------------------------------------------------------------
    revno: 320.1.54
    merged: vcs-imports at canonical.com-20070607133449-hih64b0hwgla87b7
    committer: marivoll
    timestamp: Thu 2007-06-07 13:34:49 +0000
    message:
      	* hildon-fm/hildon-file-system-root.c
      	(hildon_file_system_root_get_folder): Set file_system of handle so
      	that cancelling works (N59441).
    ------------------------------------------------------------
    revno: 320.1.55
    merged: vcs-imports at canonical.com-20070608130506-nvmnzubjk53qg5e6
    committer: marivoll
    timestamp: Fri 2007-06-08 13:05:06 +0000
    message:
      	* hildon-fm/hildon-file-system-root.c
      	(hildon_file_system_root_get_folder): Explicitly set file_system
      	of the handle to NULL.
      	* hildon-fm/hildon-file-system-model.c (unlink_file_folder): Do
      	not call gtk_file_system_cancel_operation when the file_system of
      	the handle is NULL, set the cancelled flag directly (N59441).
    ------------------------------------------------------------
    revno: 320.1.56
    merged: vcs-imports at canonical.com-20070608141123-n4rsoj7033diqi7f
    committer: marivoll
    timestamp: Fri 2007-06-08 14:11:23 +0000
    message:
      (no message)
    ------------------------------------------------------------
    revno: 320.1.57
    merged: vcs-imports at canonical.com-20070612160243-bjlbcxvm7x1elmzi
    committer: marivoll
    timestamp: Tue 2007-06-12 16:02:43 +0000
    message:
      	* hildon-fm/hildon-file-system-storage-dialog.h,
      	hildon-fm/hildon-file-system-storage-dialog.c: New.
      	* hildon-fm/Makefile.am (libhildonfm_la_SOURCES): Added them.
    ------------------------------------------------------------
    revno: 320.1.58
    merged: vcs-imports at canonical.com-20070612160815-nqvqevz3aqymzbay
    committer: marivoll
    timestamp: Tue 2007-06-12 16:08:15 +0000
    message:
      Corrected silly typo.
    ------------------------------------------------------------
    revno: 320.1.59
    merged: vcs-imports at canonical.com-20070612161030-35mvexjkn0u0400e
    committer: marivoll
    timestamp: Tue 2007-06-12 16:10:30 +0000
    message:
      Added some "default:" switch labels to shut up GCC warnings.
    ------------------------------------------------------------
    revno: 320.1.60
    merged: vcs-imports at canonical.com-20070613110022-88ulq9o1qsteabhp
    committer: marivoll
    timestamp: Wed 2007-06-13 11:00:22 +0000
    message:
      	* hildon-fm/hildon-file-system-storage-dialog.c: Get size of
      	installed applications.  Document exported API.
    ------------------------------------------------------------
    revno: 320.1.61
    merged: vcs-imports at canonical.com-20070613110611-tpyxez6c7nqa8y81
    committer: marivoll
    timestamp: Wed 2007-06-13 11:06:11 +0000
    message:
      	(file_system_storage_dialog_stats_get_apps_cb): Installed-Size as
      	reprted by maemo-list-user-packages is in units of 1024 bytes, not
      	bytes.
    ------------------------------------------------------------
    revno: 320.1.62
    merged: vcs-imports at canonical.com-20070613130822-x724ba31308ma9jw
    committer: marivoll
    timestamp: Wed 2007-06-13 13:08:22 +0000
    message:
      Do not include glib/gi18n.h, but do include
      hildon-file-common-private.h to pick up the right definition of '_'.
      (file_system_storage_dialog_stats_get_disk): Avoid overflow when
      multiplying with blocksize.
    ------------------------------------------------------------
    revno: 320.1.63
    merged: vcs-imports at canonical.com-20070613161551-ajxommnuiunznt44
    committer: marivoll
    timestamp: Wed 2007-06-13 16:15:51 +0000
    message:
      	Released 1.9.29
    ------------------------------------------------------------
    revno: 320.1.64
    merged: vcs-imports at canonical.com-20070614093746-4flyeqvb0tubm8m9
    committer: marivoll
    timestamp: Thu 2007-06-14 09:37:46 +0000
    message:
      	* hildon-fm/hildon-file-system-voldev.c
      	(hildon_file_system_voldev_volumes_changed): Do not try to fixup
      	the icon when it is NULL.  Thanks to Carlos Garnacho!
    ------------------------------------------------------------
    revno: 320.1.65
    merged: vcs-imports at canonical.com-20070615103059-oj1d9znjfl0qt2wf
    committer: marivoll
    timestamp: Fri 2007-06-15 10:30:59 +0000
    message:
      	* hildon-fm/Makefile.am (hildonincludeinst_DATA): Add
      	hildon-file-system-storage-dialog.h here as well, stupid.
    ------------------------------------------------------------
    revno: 320.1.66
    merged: vcs-imports at canonical.com-20070619080643-wkufr8aw2szkgwbu
    committer: kihamala
    timestamp: Tue 2007-06-19 08:06:43 +0000
    message:
      patch from Carlos Garnacho
    ------------------------------------------------------------
    revno: 320.1.67
    merged: vcs-imports at canonical.com-20070619104534-98csrhyk1zdb5nzk
    committer: kihamala
    timestamp: Tue 2007-06-19 10:45:34 +0000
    message:
      more bugs to debian/changelog
    ------------------------------------------------------------
    revno: 320.1.68
    merged: vcs-imports at canonical.com-20070619111627-yy1gvgck3tce1cxk
    committer: kihamala
    timestamp: Tue 2007-06-19 11:16:27 +0000
    message:
      tagging
    ------------------------------------------------------------
    revno: 320.1.69
    merged: vcs-imports at canonical.com-20070619144114-6welyr5ndrzghign
    committer: kihamala
    timestamp: Tue 2007-06-19 14:41:14 +0000
    message:
      fixed icons and localised names for drives
    ------------------------------------------------------------
    revno: 320.1.70
    merged: vcs-imports at canonical.com-20070619152318-qy9u7kqnvbelt67d
    committer: kihamala
    timestamp: Tue 2007-06-19 15:23:18 +0000
    message:
      releasing
    ------------------------------------------------------------
    revno: 320.1.71
    merged: vcs-imports at canonical.com-20070620074310-d0d46z9jkvomly6q
    committer: richard
    timestamp: Wed 2007-06-20 07:43:10 +0000
    message:
      Fix NB#59746.
    ------------------------------------------------------------
    revno: 320.1.72
    merged: vcs-imports at canonical.com-20070621082612-hg8zb7qrpvn6qy1v
    committer: kihamala
    timestamp: Thu 2007-06-21 08:26:12 +0000
    message:
      added note about unreleased status
    ------------------------------------------------------------
    revno: 320.1.73
    merged: vcs-imports at canonical.com-20070621090753-ae7redvrp1k8psmi
    committer: richard
    timestamp: Thu 2007-06-21 09:07:53 +0000
    message:
      Fix NB#61357.
    ------------------------------------------------------------
    revno: 320.1.74
    merged: vcs-imports at canonical.com-20070621093202-mm9jy82ou016up0u
    committer: richard
    timestamp: Thu 2007-06-21 09:32:02 +0000
    message:
      Improve fix for NB#59746.
    ------------------------------------------------------------
    revno: 320.1.75
    merged: vcs-imports at canonical.com-20070621093839-3odj39c0kfol25il
    committer: richard
    timestamp: Thu 2007-06-21 09:38:39 +0000
    message:
      Update changelog.
    ------------------------------------------------------------
    revno: 320.1.76
    merged: vcs-imports at canonical.com-20070621100918-onxbuuwpf2tho3y5
    committer: richard
    timestamp: Thu 2007-06-21 10:09:18 +0000
    message:
      Update changelog.
    ------------------------------------------------------------
    revno: 320.1.77
    merged: vcs-imports at canonical.com-20070621114129-9xddei2w40f8el8d
    committer: kihamala
    timestamp: Thu 2007-06-21 11:41:29 +0000
    message:
      releasing this
    ------------------------------------------------------------
    revno: 320.1.78
    merged: vcs-imports at canonical.com-20070626123817-2jwhd7k9cw06tt7i
    committer: richard
    timestamp: Tue 2007-06-26 12:38:17 +0000
    message:
      Fix NB#59187.
    ------------------------------------------------------------
    revno: 320.1.79
    merged: vcs-imports at canonical.com-20070628084728-o49tu6m3h1i27tjh
    committer: richard
    timestamp: Thu 2007-06-28 08:47:28 +0000
    message:
      NB#59429
    ------------------------------------------------------------
    revno: 320.1.80
    merged: vcs-imports at canonical.com-20070702125401-uw4inoobns3r1uy7
    committer: kihamala
    timestamp: Mon 2007-07-02 12:54:01 +0000
    message:
      releasing hildon-fm
    ------------------------------------------------------------
    revno: 320.1.81
    merged: vcs-imports at canonical.com-20070704095809-9qog1izvb00hijzy
    committer: richard
    timestamp: Wed 2007-07-04 09:58:09 +0000
    message:
      Clarify API doc and make mime type checking fast.
    ------------------------------------------------------------
    revno: 320.1.82
    merged: vcs-imports at canonical.com-20070711120044-q2su5gcu90e2q2mw
    committer: marivoll
    timestamp: Wed 2007-07-11 12:00:44 +0000
    message:
      	* hildon-fm/hildon-file-system-storage-dialog.c
      	(hildon_file_system_storage_dialog_class_init): Call
      	gnome_vfs_init since we use it.
    ------------------------------------------------------------
    revno: 320.1.83
    merged: vcs-imports at canonical.com-20070711120126-v2cpmyj622o1tho1
    committer: marivoll
    timestamp: Wed 2007-07-11 12:01:26 +0000
    message:
      (no message)
    ------------------------------------------------------------
    revno: 320.1.84
    merged: vcs-imports at canonical.com-20070711133115-nv7ipglafkvek9nl
    committer: richard
    timestamp: Wed 2007-07-11 13:31:15 +0000
    message:
      Fix NB#63101.
    ------------------------------------------------------------
    revno: 320.1.85
    merged: vcs-imports at canonical.com-20070718163648-iozk1zlbtyswyxty
    committer: marivoll
    timestamp: Wed 2007-07-18 16:36:48 +0000
    message:
      (no message)
    ------------------------------------------------------------
    revno: 320.1.86
    merged: vcs-imports at canonical.com-20070718164000-ut01ebudwd9ggb7u
    committer: marivoll
    timestamp: Wed 2007-07-18 16:40:00 +0000
    message:
      Link test program against local libhildonfm.  Include local header.
    ------------------------------------------------------------
    revno: 320.1.87
    merged: vcs-imports at canonical.com-20070718164413-v944b00oiqjt6eo8
    committer: marivoll
    timestamp: Wed 2007-07-18 16:44:13 +0000
    message:
      libhildonfm (1:1.9.34) unstable; urgency=low
      
        [ Richard Hult ]
        * Clarify API doc comments about the storage root URIs for the storage
          details dialog, fix a small unlikely leak and only do fast MIME type
          checking.
        * Fixes: NB#63101. mmc-undefined-name in hildon-file-system-storage-dialog
          for memory card.
      
       -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 18 Jul 2007 19:43:44 +0300
    ------------------------------------------------------------
    revno: 320.1.88
    merged: vcs-imports at canonical.com-20070718172426-250unpl0xsgesxrv
    committer: marivoll
    timestamp: Wed 2007-07-18 17:24:26 +0000
    message:
      	* hildon-fm/hildon-file-chooser-dialog.c (create_folder_callback):
      	Take sfil_ni_operation_failed from the hildon-common-strings
      	domain, stupid.
-------------- next part --------------
Diff too large for email (3297 lines, the limit is 1000).


More information about the Pkg-maemo-commits mailing list