← Back to branch summary

~ubuntu-branches/debian/sid/thunar/sid

« back to all changes in this revision

Viewing changes to thunar/thunar-file.c

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez, Yves-Alexis Perez, Lionel Le Folgoc
  • Date: 2011-06-18 23:23:52 UTC
  • mfrom: (1.2.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20110618232352-57ua2sh3kg722xem
Tags: 1.2.2-1
http://bugs.debian.org/626200
https://launchpad.net/bugs/775117
https://launchpad.net/bugs/781048
[ Yves-Alexis Perez ]
* New upstream release.
  - load network stuff later to speed up start (Xfce #7373).  closes: #626200
    lp: #775117
  - fixed Dutch translation                                       lp: #781048
* debian/patches:
  - 01_use-system-td dropped, included upstream.
  - 02_thunar-icon-naming-spec-compliance dropped, don't replace stock icons
    even if they aren't part of the spec.
  - 03_Don-t-interpret-file-display-names-as-format-strings dropped,
    included upstream.
* debian/control:
  - drop build-dep on xfce4-dev-tools, libtool and gtk-doc-tools
* debian/rules:
  - don't run xdt-autogen anymore.

[ Lionel Le Folgoc ]
* debian/patches:
  - 01_retrieve-the-translated-desktop-file-name.patch: fixes untranslated
    .desktop display name.
  - series: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
thunar/thunar-file.c
702
702
                  GCancellable *cancellable,
703
703
                  GError      **error)
704
704
{
705
 
  GKeyFile *key_file;
706
 
  GError   *err = NULL;
707
 
  GFile    *thumbnail_dir;
708
 
  gchar    *base_name;
709
 
  gchar    *md5_hash;
710
 
  gchar    *p;
711
 
  gchar    *thumbnail_dir_path;
712
 
  gchar    *uri = NULL;
 
705
  const gchar *target_uri;
 
706
  GKeyFile    *key_file;
 
707
  GError      *err = NULL;
 
708
  GFile       *thumbnail_dir;
 
709
  gchar       *base_name;
 
710
  gchar       *md5_hash;
 
711
  gchar       *p;
 
712
  gchar       *thumbnail_dir_path;
 
713
  gchar       *uri = NULL;
713
714
 
714
715
  _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
715
716
  _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
750
751
    {
751
752
      if (g_file_info_get_file_type (file->info) == G_FILE_TYPE_MOUNTABLE)
752
753
        {
753
 
          file->is_mounted = 
754
 
            !g_file_info_get_attribute_boolean (file->info,
755
 
                                                G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT);
 
754
          target_uri = 
 
755
            g_file_info_get_attribute_string (file->info,
 
756
                                              G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
 
757
          file->is_mounted = (target_uri != NULL);
756
758
        }
757
759
    }
758
760
  else
820
822
 
821
823
          /* read the display name from the .desktop file (will be overwritten later
822
824
           * if it's undefined here) */
823
 
          file->display_name = g_key_file_get_string (key_file,
824
 
                                                      G_KEY_FILE_DESKTOP_GROUP,
825
 
                                                      G_KEY_FILE_DESKTOP_KEY_NAME,
826
 
                                                      NULL);
 
825
          file->display_name = g_key_file_get_locale_string (key_file,
 
826
                                                             G_KEY_FILE_DESKTOP_GROUP,
 
827
                                                             G_KEY_FILE_DESKTOP_KEY_NAME,
 
828
                                                             NULL,
 
829
                                                             NULL);
827
830
          
828
831
          /* check if we have a display name now */
829
832
          if (file->display_name != NULL)
2299
2302
  if (file->info == NULL)
2300
2303
    return FALSE;
2301
2304
 
2302
 
  return g_file_info_get_is_hidden (file->info);
 
2305
  return g_file_info_get_is_hidden (file->info)
 
2306
         || g_file_info_get_is_backup (file->info);
2303
2307
}
2304
2308
 
2305
2309
 
2910
2914
        {
2911
2915
          icon_file = g_file_icon_get_file (G_FILE_ICON (icon));
2912
2916
          icon_name = g_file_get_path (icon_file);
2913
 
          g_object_unref (icon_file);
2914
2917
        }
2915
2918
    }
2916
2919