← Back to branch summary

~noskcaj/ubuntu/trusty/gthumb/3.2.5

« back to all changes in this revision

Viewing changes to gthumb/gth-metadata-provider.c

  • Committer: Package Import Robot
  • Author(s): David Paleino
  • Date: 2011-12-22 22:40:29 UTC
  • mfrom: (5.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20111222224029-l58g65u1nfa6ojtg
Tags: 3:2.14.1-1
http://bugs.debian.org/652692
* New upstream version (Closes: #652692)
* Patches refreshed
* Bump build-dependencies requirements
* Fix FTBFS, added missing #include
* debian/watch fixed to point to new location (.xz tarballs)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gthumb/gth-metadata-provider.c
53
53
static void
54
54
gth_metadata_provider_real_read (GthMetadataProvider *self,
55
55
                                 GthFileData         *file_data,
56
 
                                 const char          *attributes)
 
56
                                 const char          *attributes,
 
57
                                 GCancellable        *cancellable)
57
58
{
58
59
        /* void */
59
60
}
63
64
gth_metadata_provider_real_write (GthMetadataProvider   *self,
64
65
                                  GthMetadataWriteFlags  flags,
65
66
                                  GthFileData           *file_data,
66
 
                                  const char            *attributes)
 
67
                                  const char            *attributes,
 
68
                                  GCancellable          *cancellable)
67
69
{
68
70
        /* void */
69
71
}
125
127
void
126
128
gth_metadata_provider_read (GthMetadataProvider *self,
127
129
                            GthFileData         *file_data,
128
 
                            const char          *attributes)
 
130
                            const char          *attributes,
 
131
                            GCancellable        *cancellable)
129
132
{
130
 
        GTH_METADATA_PROVIDER_GET_CLASS (self)->read (self, file_data, attributes);
 
133
        GTH_METADATA_PROVIDER_GET_CLASS (self)->read (self, file_data, attributes, cancellable);
131
134
}
132
135
 
133
136
 
135
138
gth_metadata_provider_write (GthMetadataProvider   *self,
136
139
                             GthMetadataWriteFlags  flags,
137
140
                             GthFileData           *file_data,
138
 
                             const char            *attributes)
 
141
                             const char            *attributes,
 
142
                             GCancellable          *cancellable)
139
143
{
140
 
        GTH_METADATA_PROVIDER_GET_CLASS (self)->write (self, flags, file_data, attributes);
 
144
        GTH_METADATA_PROVIDER_GET_CLASS (self)->write (self, flags, file_data, attributes, cancellable);
141
145
}
142
146
 
143
147
 
193
197
                        GthMetadataProvider *metadata_provider = scan_providers->data;
194
198
 
195
199
                        if (gth_metadata_provider_can_read (metadata_provider, gth_file_data_get_mime_type (file_data), qmd->attributes_v))
196
 
                                gth_metadata_provider_read (metadata_provider, file_data, qmd->attributes);
 
200
                                gth_metadata_provider_read (metadata_provider, file_data, qmd->attributes, cancellable);
197
201
                }
198
202
        }
199
203
 
318
322
                        GthMetadataProvider *metadata_provider = scan_providers->data;
319
323
 
320
324
                        if (gth_metadata_provider_can_write (metadata_provider, gth_file_data_get_mime_type (file_data), wmd->attributes_v))
321
 
                                gth_metadata_provider_write (metadata_provider, wmd->flags, file_data, wmd->attributes);
 
325
                                gth_metadata_provider_write (metadata_provider, wmd->flags, file_data, wmd->attributes, cancellable);
322
326
                }
323
327
        }
324
328