gtk2passwordapp.rb in gtk2passwordapp-0.0.4

- old
+ new

@@ -1,6 +1,6 @@
-# $Date: 2009/02/20 18:46:02 $
+# $Date: 2009/02/21 13:56:55 $
 require 'lib/passwords_data'
 require 'gtk2'
 require 'find'
 
 class Gtk2PasswordApp
@@ -11,11 +11,11 @@
 	'comments'	=> "Ruby-Gtk2 Password Manager.",
 	'version'	=> $version,
 	'website'	=> 'http://ruby-gnome-apps.blogspot.com/search/label/Passwords',
 	'website-label'	=> 'Ruby Gnome Password Manager',
 	'license'	=> 'GPL',
-	'copyright'	=> '$Date: 2009/02/20 18:46:02 $'.gsub(/\s*\$\s*/,''),
+	'copyright'	=> '$Date: 2009/02/21 13:56:55 $'.gsub(/\s*\$\s*/,''),
 	'logo'		=> Gdk::Pixbuf.new(LOGO_IMAGE),
   }
 
   BUTTONS = [[ :username, :current, :url, ],[ :note, :edit, :quit, ],]
 
@@ -538,40 +538,41 @@
     rescue Exception
       puts_bang!
     end
   end
 
+  def main_quit(icon)
+      quit_windows
+      icon.set_visible(false)
+      icon = nil
+      Gtk.main_quit
+  end
+
   def status_icon
     icon = Gtk::StatusIcon.new
     icon.set_icon_name(Gtk::Stock::DIALOG_AUTHENTICATION)
     icon.tooltip = 'Password Manager'
     icon.signal_connect('activate') {
       if @window then
         quit_windows
       else
-        menu = Gtk::Menu.new
+        main_quit(icon) if !verify_user
 
-        if verify_user then
-          @passwords.accounts.each {|account|
-            menuitem = Gtk::MenuItem.new(account)
-            menuitem.child.modify_fg(Gtk::STATE_NORMAL, RED) if @passwords.expired?(account)
-            menu.append(menuitem)
-            menuitem.signal_connect('activate'){|b|
-              primary   = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
-              clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
-              primary.text = clipboard.text = @passwords.password_of(b.child.text.strip)
-            }
+        menu = Gtk::Menu.new
+        @passwords.accounts.each {|account|
+          menuitem = Gtk::MenuItem.new(account)
+          menuitem.child.modify_fg(Gtk::STATE_NORMAL, RED) if @passwords.expired?(account)
+          menu.append(menuitem)
+          menuitem.signal_connect('activate'){|b|
+            primary   = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
+            clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
+            primary.text = clipboard.text = @passwords.password_of(b.child.text.strip)
           }
-          menu.append( Gtk::SeparatorMenuItem.new )
-        end
+        }
+        menu.append( Gtk::SeparatorMenuItem.new )
 
         menuitem = Gtk::MenuItem.new('Quit')
-        menuitem.signal_connect('activate'){
-          quit_windows
-          icon.set_visible(false)
-          icon = nil
-          Gtk.main_quit
-        }
+        menuitem.signal_connect('activate'){ main_quit(icon) }
         menu.append(menuitem)
 
         Gtk::AboutDialog.set_url_hook{|about,link| system( "#{BROWSER} '#{link}' > /dev/null 2>&1 &" ) }
         menuitem = Gtk::MenuItem.new('About')
         menuitem.signal_connect('activate'){