gnome-activity-journal/make-libgnomeui-optional.patch

   1 diff -Naur gnome-activity-journal-0.8.0.orig/src/common.py gnome-activity-journal-0.8.0/src/common.py
   2 --- gnome-activity-journal-0.8.0.orig/src/common.py     2011-07-16 18:27:43.000000000 +0200
   3 +++ gnome-activity-journal-0.8.0/src/common.py  2011-10-09 07:04:07.011645989 +0200
   4 @@ -29,7 +29,6 @@
   5  import gobject
   6  import gettext
   7  import gio
   8 -import gnome.ui
   9  import glib
  10  import gtk
  11  import os
  12 @@ -44,6 +43,12 @@
  13  import zipfile
  14
  15  try:
  16 +    import gnome.ui
  17 +    gnomeui = True
  18 +except ImportError:
  19 +    gnomeui = None
  20 +
  21 +try:
  22      import pygments
  23  except ImportError:
  24      pygments = None
  25 @@ -72,10 +77,11 @@
  26  SIZE_TEXT_TIMELINEVIEW = ["small", "medium", "large", "x-large"]
  27  SIZE_TEXT_THUMBVIEW = ["x-small", "small", "large", "xx-large"]
  28
  29 -THUMBNAIL_FACTORIES = {
  30 -    SIZE_NORMAL: gnome.ui.ThumbnailFactory("normal"),
  31 -    SIZE_LARGE: gnome.ui.ThumbnailFactory("large")
  32 -}
  33 +if gnomeui:
  34 +    THUMBNAIL_FACTORIES = {
  35 +        SIZE_NORMAL: gnome.ui.ThumbnailFactory("normal"),
  36 +        SIZE_LARGE: gnome.ui.ThumbnailFactory("large")
  37 +    }
  38  ICON_THEME = gtk.icon_theme_get_default()
  39
  40  #FIXME i know it's ugly. Btw this is only a temp solution. It will be removed
  41 @@ -878,39 +884,41 @@
  42          try:
  43              thumb = THUMBS[size][self.uri]
  44          except KeyError:
  45 +            thumb = None
  46 -            factory = THUMBNAIL_FACTORIES[size]
  47 -            location = factory.lookup(self.uri, self.mtime)
  48 -            if location:
  49 -                thumb, mtime = THUMBS[size][self.uri] = \
  50 -                    (gtk.gdk.pixbuf_new_from_file(location), self.mtime)
  51 -            else:
  52 -                if factory.has_valid_failed_thumbnail(self.uri, self.mtime):
  53 -                    thumb = THUMBS[size][self.uri] = None
  54 +            if gnomeui:
  55 +                factory = THUMBNAIL_FACTORIES[size]
  56 +                location = factory.lookup(self.uri, self.mtime)
  57 +                if location:
  58 +                    thumb, mtime = THUMBS[size][self.uri] = \
  59 +                        (gtk.gdk.pixbuf_new_from_file(location), self.mtime)
  60                  else:
  61 -                    thumb = factory.generate_thumbnail(self.uri, self.mime_type)
  62 -                    if thumb is None:
  63 -                        # maybe we are able to use a custom thumbnailer here
  64 -                        if filter(lambda name: "application-vnd.oasis.opendocument" in name, self.icon_names):
  65 -                            thumb = create_opendocument_thumb(self._file_object.get_path())
  66 -                        elif "text-x-generic" in self.icon_names or "text-x-script" in self.icon_names:
  67 -                            try:
  68 -                                thumb = create_text_thumb(self, size, 1)
  69 -                            except Exception:
  70 -                                thumb = None
  71 -                        elif "audio-x-generic" in self.icon_names:
  72 -                            pass
  73 -                            #FIXME
  74 -                            #thumb = self.get_audio_cover(size)
  75 -                    if thumb is None:
  76 -                        factory.create_failed_thumbnail(self.uri, self.mtime)
  77 +                    if factory.has_valid_failed_thumbnail(self.uri, self.mtime):
  78 +                        thumb = THUMBS[size][self.uri] = None
  79                      else:
  80 -                        width, height = thumb.get_width(), thumb.get_height()
  81 -                        if width > size[0] or height > size[1]:
  82 -                            scale = min(float(size[0])/width, float(size[1])/height)
  83 -                            thumb = gnome.ui.thumbnail_scale_down_pixbuf(
  84 -                                thumb, int(scale*width), int(scale*height))
  85 -                        factory.save_thumbnail(thumb, self.uri, self.mtime)
  86 -                        THUMBS[size][self.uri] = (thumb, self.mtime)
  87 +                        thumb = factory.generate_thumbnail(self.uri, self.mime_type)
  88 +                        if thumb is None:
  89 +                            # maybe we are able to use a custom thumbnailer here
  90 +                            if filter(lambda name: "application-vnd.oasis.opendocument" in name, self.icon_names):
  91 +                                thumb = create_opendocument_thumb(self._file_object.get_path())
  92 +                            elif "text-x-generic" in self.icon_names or "text-x-script" in self.icon_names:
  93 +                                try:
  94 +                                    thumb = create_text_thumb(self, size, 1)
  95 +                                except Exception:
  96 +                                    thumb = None
  97 +                            elif "audio-x-generic" in self.icon_names:
  98 +                                pass
  99 +                                #FIXME
 100 +                                #thumb = self.get_audio_cover(size)
 101 +                        if thumb is None:
 102 +                            factory.create_failed_thumbnail(self.uri, self.mtime)
 103 +                        else:
 104 +                            width, height = thumb.get_width(), thumb.get_height()
 105 +                            if width > size[0] or height > size[1]:
 106 +                                scale = min(float(size[0])/width, float(size[1])/height)
 107 +                                thumb = gnome.ui.thumbnail_scale_down_pixbuf(
 108 +                                    thumb, int(scale*width), int(scale*height))
 109 +                            factory.save_thumbnail(thumb, self.uri, self.mtime)
 110 +                            THUMBS[size][self.uri] = (thumb, self.mtime)
 111          else:
 112              if thumb is not None:
 113                  if thumb[1] != self.mtime: