Changeset 4128 for trunk

Timestamp:

02/19/09 18:45:47 (4 years ago)

Author:

gpolo

Message:

Merged revisions 4125-4126 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/NetworkInventory

........

r4125 | gpolo | 2009-02-19 10:01:17 -0300 (Thu, 19 Feb 2009) | 1 line

Removing remaining old copyright notices

........

r4126 | gpolo | 2009-02-19 10:13:13 -0300 (Thu, 19 Feb 2009) | 3 lines

• Fixed check for hostname existence;
• Corrected some typos in comments.

........

Location:

trunk

Files:

• . (modified) (1 prop)
• umitDB/__init__.py (modified) (1 diff)
• umitInventory/About.py (modified) (4 diffs)
• umitInventory/InventoryTree.py (modified) (2 diffs)
• umitInventory/__init__.py (modified) (1 diff)

trunk/umitDB/__init__.py

@@ -26 +26 @@
               'Joao Paulo de Souza Medeiros <ignotus21@gmail.com>']
 __date__ = "20 Aug 2007"
-__copyright__ = "Copyright (C) 2007 Insecure.Com LCC"
 __license__ = "GPL"
 __version__ = "630" # more like a build version

trunk/umitInventory/About.py

@@ -31 +31 @@
 from umitCore.I18N import _
 from umitCore.Paths import Path, VERSION
-from umitInventory import __author__, __version__, __copyright__
+from umitInventory import __author__, __version__
 
 pixmaps_dir = Path.pixmaps_dir
@@ -54 +54 @@
                     "2007.\nThanks Google!"))
 
-        self.lbl_copyright = gtk.Label("<small>%s</small>" % __copyright__)
         self.logo_img = gtk.Image()
         self.logo_img.set_from_file(logo)
@@ -72 +71 @@
         self.set_position(gtk.WIN_POS_CENTER)
         self.lbl_program_version.set_use_markup(True)
-        self.lbl_copyright.set_use_markup(True)
         self.lbl_program_description.set_justify(gtk.JUSTIFY_CENTER)
 
-        self.lbl_copyright.set_selectable(True)
         self.lbl_program_description.set_selectable(True)
         self.lbl_program_version.set_selectable(True)
@@ -90 +87 @@
         main_vbox.pack_start(self.lbl_program_version)
         main_vbox.pack_start(self.lbl_program_description)
-        main_vbox.pack_start(self.lbl_copyright)
 
         btns_box.pack_end(self.btn_close)

trunk/umitInventory/InventoryTree.py

@@ -167 +167 @@
 
                 if self.show_hosts_by == HOSTNAME: # default mode
-                    if addr[3]: # check for hosts existance
+                    if addr[3] and addr[3][0]: # check for hostnames existence
                         append_now = addr[3][0] # show first hostname
 
                 elif self.show_hosts_by == IPV6:
-                    if addr[1]: # check for ipv6 existance
+                    if addr[1]: # check for ipv6 existence
                         append_now = addr[1]
 
                 elif self.show_hosts_by == MAC:
-                    if addr[2]: # check for ipv6 existance
+                    if addr[2]: # check for mac existence
                         append_now =  addr[2]
 
@@ -197 +197 @@
         Open Inventory for editing.
         """
-        # checking for inventory existance in schemas file.
+        # checking for inventory existence in schemas file.
         schemas = ConfigParser()
         schemas.read(Path.sched_schemas)

trunk/umitInventory/__init__.py

@@ -24 +24 @@
 __author__ = "Guilherme Polo <ggpolo@gmail.com>"
 __date__ = "20 Aug 2007"
-__copyright__ = "Copyright (C) 2007 Insecure.Com LCC"
 __license__ = "GPL"
 __version__ = "630" # more like a build version