* cosmetics

lib/mu-store-priv.hh

@@ -78,7 +78,6 @@ public:
 	_MuStore (const char *path) {
 
 		init (path, NULL, false, false);
-
 		_db = new Xapian::Database (path);
 		if (mu_store_needs_upgrade(this))
 			throw MuStoreError (MU_ERROR_XAPIAN_NOT_UP_TO_DATE,

lib/mu-store-read.cc

@@ -79,7 +79,7 @@ mu_store_new_read_only (const char* xpath, GError **err)
 
 	} catch (const MuStoreError& merr) {
 		mu_util_g_set_error (err, merr.mu_error(), "%s",
-				merr.what().c_str());
+				     merr.what().c_str());
 
 	} MU_XAPIAN_CATCH_BLOCK_G_ERROR(err, MU_ERROR_XAPIAN);
 
@@ -126,9 +126,11 @@ mu_store_needs_upgrade (MuStore *store)
 {
 	g_return_val_if_fail (store, TRUE);
 
-	return  (g_strcmp0 (mu_store_version (store),
-			    MU_STORE_SCHEMA_VERSION)  == 0) ? FALSE : TRUE;
+	// g_print ("'%s' <=> '%s'\n", mu_store_version (store),
+	// MU_STORE_SCHEMA_VERSION);
 
+	return  (g_strcmp0 (mu_store_version (store),
+			    MU_STORE_SCHEMA_VERSION) == 0) ? FALSE : TRUE;
 }
 
 
@@ -197,7 +199,7 @@ mu_store_get_docid_for_path (MuStore *store, const char* path, GError **err)
 
 
 time_t
-mu_store_get_timestamp (MuStore *store, const char* msgpath, GError **err)
+mu_store_get_timestamp (MuStore *store, const char *msgpath, GError **err)
 {
 	char *stampstr;
 	time_t rv;

lib/mu-store.h

@@ -308,8 +308,7 @@ gboolean mu_store_is_read_only (MuStore *store);
  * @return MU_OK if all went well, MU_STOP if the foreach was interrupted,
  * MU_ERROR in case of error
  */
-typedef MuError (*MuStoreForeachFunc) (const char* path,
-					      void *user_data);
+typedef MuError (*MuStoreForeachFunc) (const char* path, gpointer user_data);
 MuError  mu_store_foreach (MuStore *self, MuStoreForeachFunc func,
 			   void *user_data, GError **err);
 
@@ -397,7 +396,8 @@ gboolean mu_store_database_is_locked (const gchar *xpath);
  * @return a MuMsg instance (use mu_msg_unref when done with it), or
  * NULL in case of error
  */
-MuMsg* mu_store_get_msg (MuStore *self, unsigned docid, GError **err);
+MuMsg* mu_store_get_msg (MuStore *self, unsigned docid, GError **err)
+	G_GNUC_WARN_UNUSED_RESULT;
 
 
 

mu4e/mu4e-headers.el

@@ -165,7 +165,6 @@ PREDICATE-FUNC as PARAM. This is useful for getting user-input.")
 ;; next are a bunch of handler functions; those will be called from mu4e~proc in
 ;; response to output from the server process
 
-
 (defun mu4e~headers-view-handler (msg)
   "Handler function for displaying a message."
   (mu4e-view msg mu4e~headers-buffer))
@@ -741,7 +740,8 @@ the query history stack."
 	mu4e~headers-buffer buf
 	mode-name "mu4e-headers"
 	mu4e~headers-last-query expr
-	global-mode-string (propertize mu4e~headers-last-query 'face 'mu4e-title-face)))
+	global-mode-string (propertize mu4e~headers-last-query
+			     'face 'mu4e-title-face)))
     (switch-to-buffer buf)
     (mu4e~proc-find
       (replace-regexp-in-string "\"" "\\\\\"" expr) ;; escape "\"