Merge pull request #129 from monsta/patch-1

[1.8] ev-jobs: don't forget to unlock the trylock'ed mutex

Makefile.am

@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAG}
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 # Set the minimum required Windows version to Windows 2000 (0x0500).
 if PLATFORM_WIN32

NEWS

@@ -1,3 +1,10 @@
+1.8.1
+-----
+
+ * Fix crash when clicking empty canvas while loading.
+ * Fix FTBFS of atril when build with the clang compiler
+ * Add keywords key to .desktop files, close #78
+
 1.8.0
 -----
 

NEWS.gnome

@@ -1535,7 +1535,7 @@ Atril  2.21.90
 Important notice for distributors:
 
     * This release overrides document permissions by default. See
-      http://bugzilla.mate.org/show_bug.cgi?id=382700 for more information
+      http://bugzilla.gnome.org/show_bug.cgi?id=382700 for more information
       about this.
     * Ghostscript interface for PostScript documents is now deprecated.
       Please use libspectre (http://libspectre.freedesktop.org/)

TODO

@@ -1,3 +1,3 @@
-See our bugzilla for list of entries we are working at
+See our bug tracker for list of issues we are working at
 
-http://bugzilla.mate.org/buglist.cgi?product=atril&bug_status=NEW
+https://github.com/mate-desktop/atril/issues

backend/djvu/djvu-document.c

@@ -654,7 +654,7 @@ djvu_document_find_find_text (EvDocumentFind   *document,
 		
 		djvu_text_page_prepare_search (tpage, case_sensitive);
 		if (tpage->links->len > 0) {
-			djvu_text_page_search (tpage, text);
+			djvu_text_page_search (tpage, text, case_sensitive);
 			matches = tpage->results;
 		}
 		djvu_text_page_free (tpage);

backend/djvu/djvu-text-page.c

@@ -365,22 +365,31 @@ djvu_text_page_append_text (DjvuTextPage *page,
  * djvu_text_page_search:
  * @page: #DjvuTextPage instance
  * @text: text to search
+ * @case_sensitive: do not ignore case
  * 
  * Searches the page for the given text. The results list has to be 
  * externally freed afterwards.
  */
 void 
 djvu_text_page_search (DjvuTextPage *page, 
-		       const char   *text)
+		       const char   *text,
+		       gboolean      case_sensitive)
 {
 	char *haystack = page->text;
+	char *search_text;
 	int search_len;
 	EvRectangle *result;
 	if (page->links->len == 0)
 		return;
 
 	search_len = strlen (text);
-	while ((haystack = strstr (haystack, text)) != NULL) {
+
+	if (case_sensitive)
+		search_text = g_strdup (text);
+	else
+		search_text = g_utf8_casefold (text, search_len);
+
+	while ((haystack = strstr (haystack, search_text)) != NULL) {
 		int start_p = haystack - page->text;
 		miniexp_t start = djvu_text_page_position (page, start_p);
 		int end_p = start_p + search_len - 1;
@@ -391,6 +400,8 @@ djvu_text_page_search (DjvuTextPage *page,
 		haystack = haystack + search_len;
 	}
 	page->results = g_list_reverse (page->results);
+
+	g_free (search_text);
 }
 
 

backend/djvu/djvu-text-page.h

@@ -51,7 +51,8 @@ char *			djvu_text_page_copy 		(DjvuTextPage *page,
 void			djvu_text_page_prepare_search	(DjvuTextPage *page,
 	       		    				 gboolean      case_sensitive);
 void 			djvu_text_page_search 		(DjvuTextPage *page, 
-		    					const char    *text);
+		    					 const char    *text,
+							 gboolean       case_sensitive);
 DjvuTextPage*		djvu_text_page_new 		(miniexp_t     text);
 void 			djvu_text_page_free 		(DjvuTextPage *page);
 

backend/pdf/ev-poppler.cc

@@ -1074,8 +1074,8 @@ ev_link_dest_from_dest (PdfDocument *pdf_document,
 
 	if (unimplemented_dest) {
 		g_warning ("Unimplemented destination: %s, please post a "
-		           "bug report in Atril bugzilla "
-		           "(http://bugzilla.mate.org) with a testcase.",
+		           "bug report on Atril bug tracker "
+		           "(https://github.com/mate-desktop/atril/issues) with a testcase.",
 			   unimplemented_dest);
 	}
 
@@ -1139,7 +1139,7 @@ ev_link_from_action (PdfDocument   *pdf_document,
 	
 	if (unimplemented_action) {
 		g_warning ("Unimplemented action: %s, please post a bug report "
-			   "in Atril bugzilla (http://bugzilla.mate.org) "
+			   "on Atril bug tracker (https://github.com/mate-desktop/atril/issues) "
 			   "with a testcase.", unimplemented_action);
 	}
 	
@@ -2694,8 +2694,8 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
 
 	if (unimplemented_annot) {
 		g_warning ("Unimplemented annotation: %s, please post a "
-		           "bug report in Atril bugzilla "
-		           "(http://bugzilla.mate.org) with a testcase.",
+		           "bug report on Atril bug tracker "
+		           "(https://github.com/mate-desktop/atril/issues) with a testcase.",
 			   unimplemented_annot);
 	}
 

backend/ps/ev-spectre.c

@@ -224,7 +224,21 @@ static char *
 ps_document_get_page_label (EvDocument *document,
 			    EvPage     *page)
 {
-	return g_strdup (spectre_page_get_label ((SpectrePage *)page->backend_page));
+        const gchar *label = spectre_page_get_label ((SpectrePage *)page->backend_page);
+        gchar       *utf8;
+
+        if (!label)
+                return NULL;
+
+        if (g_utf8_validate (label, -1, NULL))
+                return g_strdup (label);
+
+        /* Try with latin1 and ASCII encondings */
+        utf8 = g_convert (label, -1, "utf-8", "latin1", NULL, NULL, NULL);
+        if (!utf8)
+                utf8 = g_convert (label, -1, "utf-8", "ASCII", NULL, NULL, NULL);
+
+        return utf8;
 }
 
 static EvDocumentInfo *

configure.ac

@@ -4,7 +4,7 @@
 
 m4_define([ev_major_version], [1])
 m4_define([ev_minor_version], [8])
-m4_define([ev_micro_version], [0])
+m4_define([ev_micro_version], [1])
 m4_define([ev_extra_version], [])
 m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 

data/atril.desktop.in.in

@@ -14,4 +14,5 @@ X-MATE-Bugzilla-Product=atril
 X-MATE-Bugzilla-Component=BugBuddyBugs
 X-MATE-Bugzilla-Version=@VERSION@
 Categories=GTK;Office;Viewer;
+Keywords=MATE;document;viewer;pdf;dvi;ps;xps;tiff;pixbuf;djvu;comics;
 MimeType=@ATRIL_MIME_TYPES@

libdocument/ev-document-misc.c

@@ -56,7 +56,7 @@ create_thumbnail_frame (int        width,
 	}
 
 	/* make sure no one is passing us garbage */
-	g_assert (width_r >= 0 && height_r >= 0);
+	g_return_val_if_fail (width_r >= 0 && height_r >= 0, NULL);
 
 	retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
 				 TRUE, 8,

libdocument/ev-file-helpers.c

@@ -197,7 +197,7 @@ ev_mkstemp_file (const char        *template,
 
 /**
  * This function is copied from
- * http://bugzilla.mate.org/show_bug.cgi?id=524831
+ * http://bugzilla.gnome.org/show_bug.cgi?id=524831
  * and renamed from g_mkdtemp to _ev_g_mkdtemp.
  *
  * If/when this function gets added to glib, it can be removed from

libview/ev-jobs.c

@@ -834,9 +834,11 @@ ev_job_fonts_run (EvJob *job)
 	/* Do not block the main loop */
 	if (!ev_document_doc_mutex_trylock ())
 		return TRUE;
-	
-	if (!ev_document_fc_mutex_trylock ())
+
+	if (!ev_document_fc_mutex_trylock ()) {
+		ev_document_doc_mutex_unlock ();
 		return TRUE;
+	}
 
 #ifdef EV_ENABLE_DEBUG
 	/* We use the #ifdef in this case because of the if */

libview/ev-pixbuf-cache.c

@@ -88,7 +88,7 @@ static gboolean      new_selection_surface_needed(EvPixbufCache      *pixbuf_cac
 #define VISIBLE_NEXT_LEN(pixbuf_cache) \
 	(MIN(pixbuf_cache->preload_cache_size, ev_document_get_n_pages (pixbuf_cache->document) - (1 + pixbuf_cache->end_page)))
 #define PAGE_CACHE_LEN(pixbuf_cache) \
-	((pixbuf_cache->end_page - pixbuf_cache->start_page) + 1)
+	(pixbuf_cache->start_page>=0?((pixbuf_cache->end_page - pixbuf_cache->start_page) + 1):0)
 
 #define MAX_PRELOADED_PAGES 3
 

libview/ev-transition-animation.c

@@ -591,8 +591,8 @@ ev_transition_animation_paint (EvTransitionAnimation *animation,
 		enum_value = g_enum_get_value (g_type_class_peek (EV_TYPE_TRANSITION_EFFECT_TYPE), type);
 
 		g_warning ("Unimplemented transition animation: '%s', "
-			   "please post a bug report in Atril bugzilla "
-			   "(http://bugzilla.mate.org) with a testcase.",
+			   "please post a bug report on Atril bug tracker "
+			   "(https://github.com/mate-desktop/atril/issues) with a testcase.",
 			   enum_value->value_nick);
 
 		/* just paint the destination slide */

libview/ev-view.c

@@ -840,6 +840,7 @@ set_scroll_adjustment (EvView *view,
 }
 
 #if !GTK_CHECK_VERSION (3, 0, 0)
+static void
 ev_view_set_scroll_adjustments (GtkLayout      *layout,
 				GtkAdjustment  *hadjustment,
 				GtkAdjustment  *vadjustment)
@@ -6567,4 +6568,3 @@ ev_view_previous_page (EvView *view)
 		return FALSE;
 	}
 }
-		

shell/ev-window.c

@@ -6086,8 +6086,8 @@ do_action_named (EvWindow *window, EvLinkAction *action)
 		ev_window_cmd_file_print (NULL, window);
 	} else {
 		g_warning ("Unimplemented named action: %s, please post a "
-		           "bug report in Atril bugzilla "
-		           "(http://bugzilla.mate.org) with a testcase.",
+		           "bug report on Atril bug tracker "
+		           "(https://github.com/mate-desktop/atril/issues) with a testcase.",
 			   name);
 	}
 }