<!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>[952] trunk/alexandria/lib/alexandria/ui/iconview_tooltips.rb: Fixes [
 #18347]</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>952</dd>
<dt>Author</dt> <dd>method</dd>
<dt>Date</dt> <dd>2008-02-24 22:06:50 -0500 (Sun, 24 Feb 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes [#18347]</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkalexandrialibalexandriauiiconview_tooltipsrb">trunk/alexandria/lib/alexandria/ui/iconview_tooltips.rb</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkalexandrialibalexandriauiiconview_tooltipsrb"></a>
<div class="modfile"><h4>Modified: trunk/alexandria/lib/alexandria/ui/iconview_tooltips.rb (951 => 952)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/alexandria/lib/alexandria/ui/iconview_tooltips.rb        2008-02-24 17:48:10 UTC (rev 951)
+++ trunk/alexandria/lib/alexandria/ui/iconview_tooltips.rb        2008-02-25 03:06:50 UTC (rev 952)
</span><span class="lines">@@ -36,21 +36,21 @@
</span><span class="cx">     @tooltip_window.signal_connect('expose_event') { |window, event|
</span><span class="cx">       on_expose(window, event) }
</span><span class="cx"> 
</span><del>-    @label = Gtk::Label.new('')
-    @label.wrap = true
-    @label.set_alignment(0.5, 0.5)
-    @label.use_markup = true
-    @label.show()
</del><ins>+      @label = Gtk::Label.new('')
+      @label.wrap = true
+      @label.set_alignment(0.5, 0.5)
+      @label.use_markup = true
+      @label.show()
</ins><span class="cx"> 
</span><del>-    @tooltip_window.add(@label)
-    set_view(view)
</del><ins>+      @tooltip_window.add(@label)
+      set_view(view)
</ins><span class="cx">   end
</span><span class="cx"> 
</span><span class="cx">   def set_view(view)
</span><span class="cx">     view.signal_connect('motion_notify_event') { |view, event|
</span><span class="cx">       on_motion(view, event) }
</span><del>-    view.signal_connect('leave_notify_event') { |view, event|
-      on_leave(view, event) }
</del><ins>+      view.signal_connect('leave_notify_event') { |view, event|
+        on_leave(view, event) }
</ins><span class="cx">   end
</span><span class="cx"> 
</span><span class="cx">   def on_expose(window, event)
</span><span class="lines">@@ -82,19 +82,20 @@
</span><span class="cx">     if (title.size &gt; 0) or (authors.size &gt; 0)
</span><span class="cx">       html += &quot;\n&quot;
</span><span class="cx">     end
</span><del>-    if (publisher.size &gt; 0) or (year.size &gt; 0)
-      html += &quot;&lt;small&gt;&quot;
-      if publisher.size &gt; 0
-        html += &quot;#{publisher}&quot;
</del><ins>+
+    html += &quot;&lt;small&gt;&quot;
+    if publisher and publisher.size &gt; 0
+      html += &quot;#{publisher}&quot;
+    end
+
+    if year and year.size &gt; 0
+      if publisher and publisher.size &gt; 0
+        html += &quot; &quot;
</ins><span class="cx">       end
</span><del>-      if year.size &gt; 0
-        if publisher.size &gt; 0
-          html += &quot; &quot;
-        end
-        html += &quot;(#{year})&quot;
-      end
-      html += &quot;&lt;/small&gt;&quot;
</del><ins>+      html += &quot;(#{year})&quot;
</ins><span class="cx">     end
</span><ins>+
+    html += &quot;&lt;/small&gt;&quot;
</ins><span class="cx">   end
</span><span class="cx"> 
</span><span class="cx">   def on_motion(view, event)
</span></span></pre>
</div>
</div>

</body>
</html>