<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[817] trunk/alexandria/lib/alexandria/ui/completion_models.rb:
No longer crashes if Revolution is present but Evolution address book</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>817</dd>
<dt>Author</dt> <dd>cathalmagus</dd>
<dt>Date</dt> <dd>2007-12-16 13:58:27 -0500 (Sun, 16 Dec 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>No longer crashes if Revolution is present but Evolution address book
cannot be found. (This happens if the user has never run Evolution.)
Fixes bug #16355</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkalexandrialibalexandriauicompletion_modelsrb">trunk/alexandria/lib/alexandria/ui/completion_models.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkalexandrialibalexandriauicompletion_modelsrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/ui/completion_models.rb (816 => 817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/ui/completion_models.rb 2007-12-14 23:26:54 UTC (rev 816)
+++ trunk/alexandria/lib/alexandria/ui/completion_models.rb 2007-12-16 18:58:27 UTC (rev 817)
</span><span class="lines">@@ -45,18 +45,17 @@
</span><span class="cx"> model = Alexandria::UI::CompletionModels.instance.models[model_id]
</span><span class="cx"> completion.model = model
</span><span class="cx"> completion.text_column = 0
</span><del>- self.completion = completion
</del><ins>+ self.completion = completion
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> begin
</span><span class="cx"> require 'revolution'
</span><del>-
- EVOLUTION_CONTACTS =
</del><ins>+
+ EVOLUTION_CONTACTS =
</ins><span class="cx"> Revolution::Revolution.new.get_all_contacts.map do |contact|
</span><del>-
</del><span class="cx"> first, last = contact.first_name, contact.last_name
</span><del>-
</del><ins>+
</ins><span class="cx"> if first
</span><span class="cx"> first.strip!
</span><span class="cx"> first = nil if first.empty?
</span><span class="lines">@@ -69,8 +68,12 @@
</span><span class="cx">
</span><span class="cx"> first and last ? first + ' ' + last : first ? first : last
</span><span class="cx"> end
</span><del>-rescue LoadError
</del><ins>+rescue LoadError => e
+ Alexandria::log.debug { "Could not find optional ruby-revolution; Evolution contacts will not be loaded"}
</ins><span class="cx"> EVOLUTION_CONTACTS = []
</span><ins>+rescue Revolution::RevolutionException => e
+ Alexandria::log.warn { e.message }
+ EVOLUTION_CONTACTS = []
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> module Alexandria
</span><span class="lines">@@ -107,7 +110,7 @@
</span><span class="cx"> rebuild_models if dirty?
</span><span class="cx"> @models
</span><span class="cx"> end
</span><del>-
</del><ins>+
</ins><span class="cx"> def title_model
</span><span class="cx"> rebuild_models if dirty?
</span><span class="cx"> @models[TITLE]
</span><span class="lines">@@ -122,7 +125,7 @@
</span><span class="cx"> rebuild_models if dirty?
</span><span class="cx"> @models[PUBLISHER]
</span><span class="cx"> end
</span><del>-
</del><ins>+
</ins><span class="cx"> def edition_model
</span><span class="cx"> rebuild_models if dirty?
</span><span class="cx"> @models[EDITION]
</span><span class="lines">@@ -136,7 +139,7 @@
</span><span class="cx"> #######
</span><span class="cx"> private
</span><span class="cx"> #######
</span><del>-
</del><ins>+
</ins><span class="cx"> def touch
</span><span class="cx"> @dirty = true
</span><span class="cx"> end
</span><span class="lines">@@ -173,7 +176,7 @@
</span><span class="cx"> iter = nil
</span><span class="cx"> values.uniq.each do |value|
</span><span class="cx"> next if value.nil?
</span><del>- iter = iter ? model.insert_after(iter) : model.append
</del><ins>+ iter = iter ? model.insert_after(iter) : model.append
</ins><span class="cx"> iter[0] = value
</span><span class="cx"> end
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>