← Back to branch summary

~ubuntu-branches/ubuntu/trusty/cheese/trusty

« back to all changes in this revision

Viewing changes to src/thumbview/cheese-thumb-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2011-07-23 00:37:49 UTC
  • mfrom: (1.3.6 upstream)
  • mto: (7.3.2 experimental) (1.6.1)
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: james.westby@ubuntu.com-20110723003749-l1l8kk5wf6iadczb
Tags: upstream-3.0.1
Import upstream version 3.0.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/thumbview/cheese-thumb-view.c
139
139
  g_free (thumb_loc);
140
140
  g_free (uri);
141
141
 
 
142
  gdk_threads_enter ();
 
143
 
142
144
  if (!pixbuf)
143
145
  {
144
146
    gchar  *escape = NULL;
161
163
    cheese_thumbnail_add_frame (&pixbuf);
162
164
  }
163
165
 
164
 
  gdk_threads_enter ();
165
 
 
166
166
  gtk_list_store_set (priv->store, &iter,
167
167
                      THUMBNAIL_PIXBUF_COLUMN, pixbuf, -1);
168
168
 
192
192
 
193
193
  filename = g_file_get_path (file);
194
194
 
195
 
  if (!(g_str_has_suffix (filename, PHOTO_NAME_SUFFIX)) && !(g_str_has_suffix (filename, VIDEO_NAME_SUFFIX)))
 
195
  if (!(g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX)) && !(g_str_has_suffix (filename, CHEESE_VIDEO_NAME_SUFFIX)))
196
196
  {
197
197
    g_free (filename);
198
198
    return;
488
488
  CheeseThumbViewPrivate *priv = CHEESE_THUMB_VIEW_GET_PRIVATE (thumb_view);
489
489
 
490
490
  GDir       *dir_videos, *dir_photos;
491
 
  char       *path_videos, *path_photos;
 
491
  const char *path_videos, *path_photos;
492
492
  const char *name;
493
493
  char       *filename;
494
494
  GFile      *file;
515
515
    /* read videos from the vid directory */
516
516
    while ((name = g_dir_read_name (dir_videos)))
517
517
    {
518
 
      if (!(g_str_has_suffix (name, VIDEO_NAME_SUFFIX)))
 
518
      if (!(g_str_has_suffix (name, CHEESE_VIDEO_NAME_SUFFIX)))
519
519
        continue;
520
520
 
521
521
      filename = g_build_filename (path_videos, name, NULL);
533
533
    /* read photos from the photo directory */
534
534
    while ((name = g_dir_read_name (dir_photos)))
535
535
    {
536
 
      if (!(g_str_has_suffix (name, PHOTO_NAME_SUFFIX)))
 
536
      if (!(g_str_has_suffix (name, CHEESE_PHOTO_NAME_SUFFIX)))
537
537
        continue;
538
538
 
539
539
      filename = g_build_filename (path_photos, name, NULL);
675
675
}
676
676
 
677
677
void
678
 
cheese_thumb_view_start_monitoring_photo_path (CheeseThumbView *thumb_view, char *path_photos)
 
678
cheese_thumb_view_start_monitoring_photo_path (CheeseThumbView *thumb_view, const char *path_photos)
679
679
{
680
680
  CheeseThumbViewPrivate *priv = CHEESE_THUMB_VIEW_GET_PRIVATE (thumb_view);
681
681
 
694
694
}
695
695
 
696
696
void
697
 
cheese_thumb_view_start_monitoring_video_path (CheeseThumbView *thumb_view, char *path_videos)
 
697
cheese_thumb_view_start_monitoring_video_path (CheeseThumbView *thumb_view, const char *path_videos)
698
698
{
699
699
  CheeseThumbViewPrivate *priv = CHEESE_THUMB_VIEW_GET_PRIVATE (thumb_view);
700
700