← Back to branch summary

~ubuntu-branches/ubuntu/precise/cheese/precise-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-02-07 00:39:22 UTC
  • mfrom: (1.2.30)
  • Revision ID: package-import@ubuntu.com-20120207003922-s17cfoc5vy1lytvj
Tags: 3.3.5-0ubuntu1
* New upstream release.
  - Videos now record to webm by default
* debian/*.symbols: Added new symbols
* debian/patches/01_hide-share-feature.patch:
  - Hide share feature because this requires an unreleased
    version of nautilus-send-to that isn't in Precise yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/thumbview/cheese-thumb-view.c
33
33
 
34
34
#include "cheese-thumb-view.h"
35
35
 
36
 
#define THUMB_VIEW_MINIMUM_WIDTH  140
37
 
#define THUMB_VIEW_MINIMUM_HEIGHT 100
 
36
const guint THUMB_VIEW_MINIMUM_WIDTH = 140;
 
37
const guint THUMB_VIEW_MINIMUM_HEIGHT = 100;
 
38
 
 
39
const gchar CHEESE_OLD_VIDEO_NAME_SUFFIX[] = ".ogv";
38
40
 
39
41
#define CHEESE_THUMB_VIEW_GET_PRIVATE(o) \
40
42
  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHEESE_TYPE_THUMB_VIEW, CheeseThumbViewPrivate))
200
202
 
201
203
  filename = g_file_get_path (file);
202
204
 
203
 
  if (!(g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX)) && !(g_str_has_suffix (filename, CHEESE_VIDEO_NAME_SUFFIX)))
 
205
  if (!(g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX))
 
206
    && !(g_str_has_suffix (filename, CHEESE_VIDEO_NAME_SUFFIX))
 
207
    && !(g_str_has_suffix (filename, CHEESE_OLD_VIDEO_NAME_SUFFIX)))
204
208
  {
205
209
    g_free (filename);
206
210
    return;
518
522
    /* read videos from the vid directory */
519
523
    while ((name = g_dir_read_name (dir_videos)))
520
524
    {
521
 
      if (!(g_str_has_suffix (name, CHEESE_VIDEO_NAME_SUFFIX)))
 
525
      if (!(g_str_has_suffix (name, CHEESE_VIDEO_NAME_SUFFIX))
 
526
        && !(g_str_has_suffix (name, CHEESE_OLD_VIDEO_NAME_SUFFIX)))
522
527
        continue;
523
528
 
524
529
      filename = g_build_filename (path_videos, name, NULL);