manqod 1.1505.0 → 1.1510.0

data/lib/About.rb

@@ -7,83 +7,35 @@ class About < Gtk::VBox
 	class Versions < Gtk::HBox
 		def initialize
 			super(true,3)
+			@progs=Hash.new
 		end
-		def add(text)
-			pack_start(Gtk::Label.new(text),true,true,2)
+		def add(text,ver)
+			pack_start(@progs[text]=Gtk::VBox.new.pack_start(Gtk::Label.new(text),true,true,2)) unless @progs.has_key?(text)
+			@progs[text].pack_start(Gtk::Label.new(ver.to_s),true,true,2)
 			self
 		end
 	end
 
-	class Svn
-		def initialize(dir)
-			@dir=dir
-			@efilename="#{dir}/.svn/entries"
-			@svn = `which svn`.strip
-		end
-		attr_accessor :entries, :efilename, :revision, :format, :source, :last_update
-		def load
-			if FileTest.exists?(efilename)
-				@entries=Array.new
-				@entries=File.new(efilename,"r").readlines
-				return false if entries.nil?
-				@format=entries[0]
-				i=0
-				while entries[i].index("dir")!=0 and i<entries.size do i=i+1;end
-				@revision=entries[i+1]
-				while entries[i].index("svn://")!=0 and i<entries.size do i=i+1;end
-				@source=entries[i]
-				while entries[i]!="\n" and i<entries.size do i=i+1;end
-				while entries[i]=="\n" and i<entries.size do i=i+1;end
-				@last_update=entries[i]
-				true
-			else
-				einfo("file not found: #{efilename}")
-				false
-			end
-		end
-		def up
-			cr=revision
-			`cd #{@dir} && #{@svn} up`
-			self.load
-			cr!=revision
-		end
-	end
-
   def initialize
 	  @title="about"
-	super(false,3)
-	path=File::expand_path(File.join(File.dirname(__FILE__),".."))
-	svn=Svn.new(path)
+		super(false,3)
 
-	if svn.load
-	  pack_start(rev=Gtk::Label.new("manqod version subversion revision #{svn.revision}"))
-	  pack_start(Gtk::HBox.new.pack_start(Gtk::Label.new).
-	  	pack_start(upb=Gtk::Button.new("update"),false,false).
-	  	pack_start(Gtk::Label.new),false,false
-	  )
-	  pack_start(Gtk::Label.new("manqod subversion source #{svn.source}"))
-	  pack_start(lu=Gtk::Label.new("manqod subversion last update #{svn.last_update}"))
-	  upb.signal_connect("clicked"){|me|
-	  	if svn.up
-				rev.set_text("#{rev.text} -> #{svn.revision}")
-				lu.set_text("#{lu.text} -> #{svn.last_update}")
-				warn("Manqod has been updated, please restart manqod!")
-			else
-				warn("No updates available!")
-			end
-	  }
-	  else
-	  pack_start(Gtk::Label.new("manqod version unknown"))
-	end
-	pack_start(Gtk::Label.new("Logged in: #{nick}"))
-	pack_start(Gtk::Label.new("LICENCE"))
-	pack_start(Gtk::Label.new("
+		pack_start(v=Versions.new,false,false)
+		Gem.cache.gems.each_pair{|key,gem| v.add(gem.name,gem.version) if gem.name.include?("manqod") }
+		pack_start(Gtk::Label.new("User logged in: #{nick}"))
+		pack_start(Gtk::Label.new("Homepage of manqod: http://manqod.sourceforge.net"))
+		pack_start(Gtk::Label.new("LICENCE: CDDL
 the author of this program(manqod) is Dobai-Pataky Balint(dpblnt@gmail.com)
 manqod is released under the CDDL licence(http://www.opensource.org/licenses/cddl1.php) don't worry this only means the following: 
 * you can use it, copy it, modify it
 * if you want your modifications to be distributed send them back to me, i'll merge them in
 * nobody can sell it"))
-	pack_end(Versions.new.add("GTK+- #{Gtk::VERSION.join(".")}").add("Ruby #{RUBY_VERSION}").add("GLib #{GLib::VERSION.join(".")}").add("Ruby/GLib #{GLib::BINDING_VERSION.join(".")}").add("Ruby/GTK #{Gtk::BINDING_VERSION.join(".")}"))
+		pack_end(Versions.new.
+			add("GTK+",Gtk::VERSION.join(".")).
+			add("Ruby",RUBY_VERSION).
+			add("GLib",GLib::VERSION.join(".")).
+			add("Ruby/GLib",GLib::BINDING_VERSION.join(".")).
+			add("Ruby/GTK",Gtk::BINDING_VERSION.join(".")),false,false)
   end
   attr_accessor :title
   

data/lib/SB/Messaging.rb

@@ -34,7 +34,11 @@ class Messaging < Gtk::Button
 					@body.buffer.delete(@body.buffer.bounds[0],@body.buffer.bounds[1])
 					@body.buffer.insert_at_cursor(si[5])
 					if si[3] == "n"
-						ManqodDB.instance.manqod_db.set_message_read(item[6],Nick.instance.get_nick)
+						begin
+							ManqodDB.instance.manqod_db.set_message_read(item[6],Nick.instance.get_nick)
+						rescue => err
+							ewarn("Can't set message read for all clients")
+						end
 						si[3]="n"
 						si[4]="Verdana 10"
 					end
@@ -45,16 +49,20 @@ class Messaging < Gtk::Button
 		attr_reader :list, :body
 		def populate
 			@mmodel.clear
-			ManqodDB.instance.manqod_db.messages(Nick.instance.get_nick).each{|message|
-				i=@mmodel.append
-				i[0]=message["date"]
-				i[1]=message["sender"]
-				i[2]=message["subject"]
-				i[3]=message["state"]
-				i[4]=(message["state"] == "n" ? "Verdana Bold 10" : "Verdana 10")
-				i[5]=message["body"]
-				i[6]=message["id"]
-			}
+			begin
+				ManqodDB.instance.manqod_db.messages(Nick.instance.get_nick).each{|message|
+					i=@mmodel.append
+					i[0]=message["date"]
+					i[1]=message["sender"]
+					i[2]=message["subject"]
+					i[3]=message["state"]
+					i[4]=(message["state"] == "n" ? "Verdana Bold 10" : "Verdana 10")
+					i[5]=message["body"]
+					i[6]=message["id"]
+				}
+			rescue => err
+				ewarn("Can't read messages from server")
+			end
 			self
 		end
 	end
@@ -69,7 +77,12 @@ class Messaging < Gtk::Button
 	end
 
 	def check_messages
-		um=ManqodDB.instance.manqod_db.unread_messages(Nick.instance.get_nick)
+		um="unknown"
+		begin
+			um=ManqodDB.instance.manqod_db.unread_messages(Nick.instance.get_nick)
+		rescue => err
+			ewarn("Can't check for messages")
+		end
 		set_label(um==0?"no":"#{um}" + " messages")
 	end
 	

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1505
+  - 1510
   - 0
-  version: 1.1505.0
+  version: 1.1510.0
 platform: ruby
 authors: 
 - Dobai-Pataky Balint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +02:00
+date: 2011-02-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,11 +36,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 90
+        - 7
+        version: 0.90.7
   type: :runtime
   version_requirements: *id002
 description: Manqod is a desktop application for small companies to organize their data on an interface customised for them by themselves