← Back to branch summary

~jm-leddy/ubuntu/oneiric/gvfs/fix-899858

« back to all changes in this revision

Viewing changes to daemon/gvfsbackendobexftp-fl-parser.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-06-04 17:05:29 UTC
  • mfrom: (1.1.21 upstream)
  • Revision ID: james.westby@ubuntu.com-20080604170529-w2qdknt7btbjt6j3
Tags: 0.99.1-0ubuntu1
* New upstream version:
  - Fix directory copy/delete problems
  - Fuse daemon robustness fixes
  - Allow mounting non-standard ISO images
  - Better username/domain tests on mount spec
  - Require gphoto >= 2.4.0
  - Fix strdup()/g_free() confusion
  - Use consistent translatable strings for mount and volume
  - Plug some memory leaks
  - Many smaller bug fixes
  - Translation updates
* debian/control.in:
  - updated libgphoto requirement
  - updated maintainer information
* debian/patches/90_from_svn_runtime_samba_debug.patch:
  - dropped, fixed in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/gvfsbackendobexftp-fl-parser.c
1
 
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
2
1
/*
3
2
 * Copyright (C) 2004-2005 Nokia Corporation.
4
3
 * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net> (gio port)
207
206
                value = attr[++i];
208
207
                
209
208
                if (strcmp (name, "name") == 0) {
 
209
                        char *display_name;
210
210
                        /* Apparently someone decided it was a good idea
211
211
                         * to send name="" mem-type="MMC" 
212
212
                         */
215
215
                        }
216
216
 
217
217
                        g_file_info_set_name (info, value);
218
 
                        d(g_print ("Name: '%s'\n", value));
 
218
                        display_name = g_filename_display_name (value);
 
219
                        g_file_info_set_display_name (info, display_name);
 
220
                        d(g_print ("Name: '%s'\n", display_name));
 
221
                        g_free (display_name);
219
222
                }
220
223
                else if (strcmp (name, "size") == 0) {
221
224
                        g_file_info_set_size (info, strtoll (value, NULL, 10));