changeset 1504:1e2737565cb7

Cleanup.
author zas_
date Tue, 31 Mar 2009 22:23:33 +0000
parents 331e2d60d447
children 2a99cf2184b0
files src/bar_exif.c src/metadata.c
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/bar_exif.c	Tue Mar 31 21:33:54 2009 +0000
+++ b/src/bar_exif.c	Tue Mar 31 22:23:33 2009 +0000
@@ -782,12 +782,11 @@
 void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values)
 {
 	PaneExifData *ped;
+	gchar *title = NULL;
 
 	ped = g_object_get_data(G_OBJECT(pane), "pane_data");
 	if (!ped) return;
 
-	gchar *title = NULL;
-
 	while (*attribute_names)
 		{
 		const gchar *option = *attribute_names++;
--- a/src/metadata.c	Tue Mar 31 21:33:54 2009 +0000
+++ b/src/metadata.c	Tue Mar 31 22:23:33 2009 +0000
@@ -473,14 +473,12 @@
 		{
 	        if (metadata_legacy_read(fd, &list, NULL)) return list;
 	        }
-
-	if (strcmp(key, COMMENT_KEY) == 0)
+	else if (strcmp(key, COMMENT_KEY) == 0)
 		{
 		gchar *comment = NULL;
 	        if (metadata_legacy_read(fd, NULL, &comment)) return g_list_append(NULL, comment);
 	        }
-	
-	if (strncmp(key, "file.", 5) == 0)
+	else if (strncmp(key, "file.", 5) == 0)
 		{
 	        return g_list_append(NULL, metadata_file_info(fd, key, format));
 		}