gnome-commander r1559 - in trunk/src: . tags

[epiotr svn gnome org]

Author: epiotr
Date: Thu Feb  7 18:23:05 2008
New Revision: 1559
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1559&view=rev

Log:
Code cleanup

Modified:
   trunk/src/gnome-cmd-app.cc
   trunk/src/gnome-cmd-dir.cc
   trunk/src/tags/gnome-cmd-tags.h

Modified: trunk/src/gnome-cmd-app.cc
==============================================================================
--- trunk/src/gnome-cmd-app.cc	(original)
+++ trunk/src/gnome-cmd-app.cc	Thu Feb  7 18:23:05 2008
@@ -113,7 +113,7 @@
 }
 
 
-void gnome_cmd_app_free (GnomeCmdApp *app) 
+void gnome_cmd_app_free (GnomeCmdApp *app)
 {
     g_return_if_fail (app != NULL);
     g_return_if_fail (app->priv != NULL);
@@ -145,7 +145,7 @@
 {
     g_return_if_fail (app != NULL);
     g_return_if_fail (app->priv != NULL);
-    
+
     if (!cmd) return;
 
     g_free (app->priv->cmd);
@@ -156,20 +156,22 @@
 
 void gnome_cmd_app_set_icon_path (GnomeCmdApp *app, const gchar *icon_path)
 {
-    GdkPixbuf *tmp;
-
     g_return_if_fail (app != NULL);
     g_return_if_fail (app->priv != NULL);
+
     if (!icon_path) return;
 
     g_free (app->priv->icon_path);
+
     if (app->priv->pixmap)
         gnome_cmd_pixmap_free (app->priv->pixmap);
 
     app->priv->icon_path = g_strdup (icon_path);
 
     //FIXME: Check GError here
-    if ((tmp = gdk_pixbuf_new_from_file (icon_path, NULL)) != NULL)
+    GdkPixbuf *tmp = gdk_pixbuf_new_from_file (icon_path, NULL);
+
+    if (tmp)
     {
         GdkPixbuf *pixbuf = gdk_pixbuf_scale_simple (tmp, 16, 16, GDK_INTERP_HYPER);
 

Modified: trunk/src/gnome-cmd-dir.cc
==============================================================================
--- trunk/src/gnome-cmd-dir.cc	(original)
+++ trunk/src/gnome-cmd-dir.cc	Thu Feb  7 18:23:05 2008
@@ -468,7 +468,7 @@
                 // This is a hack to make samba workgroups etc
                 // look like normal directories
                 info->type = GNOME_VFS_FILE_TYPE_DIRECTORY;
-                // Determining smb mime type: workgroup or server
+                // Determining smb MIME type: workgroup or server
                 gchar *uri_str = gnome_cmd_file_get_uri_str (GNOME_CMD_FILE (dir));
 
                 info->mime_type = strcmp (uri_str, "smb:///") == 0 ? g_strdup ("x-directory/smb-workgroup") :

Modified: trunk/src/tags/gnome-cmd-tags.h
==============================================================================
--- trunk/src/tags/gnome-cmd-tags.h	(original)
+++ trunk/src/tags/gnome-cmd-tags.h	Thu Feb  7 18:23:05 2008
@@ -254,7 +254,7 @@
     TAG_FILE_ACCESSED,                      // last access datetime
     TAG_FILE_CONTENT,                       // file's contents filtered as plain text (IE as stored by the indexer)
     TAG_FILE_DESCRIPTION,                   // editable free text/notes
-    TAG_FILE_FORMAT,                        // mime type of the file or if a directory it should contain value "Folder"
+    TAG_FILE_FORMAT,                        // MIME type of the file or if a directory it should contain value "Folder"
     TAG_FILE_KEYWORDS,                      // editable array of keywords
     TAG_FILE_LINK,                          // URI of link target
     TAG_FILE_MODIFIED,                      // last modified datetime