GNOME.org
 

[gthumb] fixed compiler warnings

commit a165db7850f0a8b422a223a65a68593f615f4736
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Feb 22 22:07:48 2010 +0100

    fixed compiler warnings

 extensions/catalogs/gth-organize-task.c      |    1 +
 extensions/change_date/dlg-change-date.c     |   10 +++--
 extensions/image_print/gth-image-print-job.c |    1 +
 extensions/importer/utils.c                  |    1 +
 extensions/picasaweb/picasa-web-album.c      |    1 +
 extensions/picasaweb/picasa-web-photo.c      |    1 +
 extensions/raw_files/main.c                  |   10 +++++-
 gthumb/gio-utils.c                           |    2 +-
 gthumb/gth-file-source-vfs.c                 |    6 +---
 gthumb/gth-icon-cache.c                      |   49 +++++++++++++------------
 gthumb/gth-overwrite-dialog.c                |    1 +
 gthumb/gth-test-simple.c                     |    1 +
 gthumb/gth-user-dir.c                        |    1 +
 gthumb/gtk-utils.c                           |    1 +
 14 files changed, 51 insertions(+), 35 deletions(-)
---
diff --git a/extensions/catalogs/gth-organize-task.c b/extensions/catalogs/gth-organize-task.c
index fa27173..ff28633 100644
--- a/extensions/catalogs/gth-organize-task.c
+++ b/extensions/catalogs/gth-organize-task.c
@@ -354,6 +354,7 @@ gth_organize_task_exec (GthTask *base)
 		attributes = "standard::name,standard::type,time::modified,time::modified-usec,Embedded::Photo::DateTimeOriginal";
 		break;
 	case GTH_GROUP_POLICY_MODIFIED_DATE:
+	default:
 		attributes = "standard::name,standard::type,time::modified,time::modified-usec";
 		break;
 	}
diff --git a/extensions/change_date/dlg-change-date.c b/extensions/change_date/dlg-change-date.c
index 40b3df5..92d0614 100644
--- a/extensions/change_date/dlg-change-date.c
+++ b/extensions/change_date/dlg-change-date.c
@@ -69,6 +69,8 @@ ok_button_clicked (GtkWidget  *button,
 	if (IS_ACTIVE (GET_WIDGET ("change_datetimeoriginal_checkbutton")))
 		change_fields |= GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG;
 
+	change_type = 0;
+	time_adjustment = 0;
 	if (IS_ACTIVE (GET_WIDGET ("to_following_date_radiobutton"))) {
 		change_type = GTH_CHANGE_TO_FOLLOWING_DATE;
 		date_time = gth_datetime_new ();
@@ -158,7 +160,7 @@ dlg_change_date (GthBrowser *browser,
 	gth_time_selector_set_value (GTH_TIME_SELECTOR (data->date_selector), datetime);
 	gtk_widget_show (data->date_selector);
 	gtk_box_pack_start (GTK_BOX (GET_WIDGET ("date_selector_box")), data->date_selector, TRUE, TRUE, 0);
-	
+
 	gth_datetime_free (datetime);
 
 	/* Set widgets data. */
@@ -166,8 +168,8 @@ dlg_change_date (GthBrowser *browser,
 	update_sensitivity (data);
 
 	/* Set the signals handlers. */
-	
-	g_signal_connect (G_OBJECT (data->dialog), 
+
+	g_signal_connect (G_OBJECT (data->dialog),
 			  "destroy",
 			  G_CALLBACK (dialog_destroy_cb),
 			  data);
@@ -218,7 +220,7 @@ dlg_change_date (GthBrowser *browser,
 
 	/* run dialog. */
 
-	gtk_window_set_transient_for (GTK_WINDOW (data->dialog), 
+	gtk_window_set_transient_for (GTK_WINDOW (data->dialog),
 				      GTK_WINDOW (browser));
 	gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE);
 	gtk_widget_show (data->dialog);
diff --git a/extensions/image_print/gth-image-print-job.c b/extensions/image_print/gth-image-print-job.c
index de7eba0..d55920e 100644
--- a/extensions/image_print/gth-image-print-job.c
+++ b/extensions/image_print/gth-image-print-job.c
@@ -1092,6 +1092,7 @@ unit_combobox_changed_cb (GtkComboBox *combo_box,
 		digits = 0;
 		break;
 	case GTH_METRIC_PIXELS:
+	default:
 		digits = 0;
 		break;
 	}
diff --git a/extensions/importer/utils.c b/extensions/importer/utils.c
index 48f3546..c17b14c 100644
--- a/extensions/importer/utils.c
+++ b/extensions/importer/utils.c
@@ -122,6 +122,7 @@ gth_import_utils_get_file_destination (GthFileData        *file_data,
 		break;
 
 	case GTH_SUBFOLDER_TYPE_NONE:
+	default:
 		child = NULL;
 		break;
 	}
diff --git a/extensions/picasaweb/picasa-web-album.c b/extensions/picasaweb/picasa-web-album.c
index 24efddf..1bfd9ae 100644
--- a/extensions/picasaweb/picasa-web-album.c
+++ b/extensions/picasaweb/picasa-web-album.c
@@ -83,6 +83,7 @@ picasa_web_album_create_element (DomDomizable *base,
 		value = "all";
 		break;
 	case PICASA_WEB_ACCESS_PRIVATE:
+	default:
 		value = "private";
 		break;
 	case PICASA_WEB_ACCESS_PUBLIC:
diff --git a/extensions/picasaweb/picasa-web-photo.c b/extensions/picasaweb/picasa-web-photo.c
index 7acf92c..3d3016b 100644
--- a/extensions/picasaweb/picasa-web-photo.c
+++ b/extensions/picasaweb/picasa-web-photo.c
@@ -88,6 +88,7 @@ picasa_web_photo_create_element (DomDomizable *base,
 		value = "all";
 		break;
 	case PICASA_WEB_ACCESS_PRIVATE:
+	default:
 		value = "private";
 		break;
 	case PICASA_WEB_ACCESS_PUBLIC:
diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c
index 4d3a526..ecce6c7 100644
--- a/extensions/raw_files/main.c
+++ b/extensions/raw_files/main.c
@@ -396,7 +396,15 @@ openraw_pixbuf_animation_new_from_file (GthFileData  *file_data,
 		}
 
 		if (command != NULL) {
-			system (command);
+			if (system (command) == -1) {
+				g_free (command);
+				g_free (cache_file_esc);
+				g_free (local_file_esc);
+				g_free (cache_file);
+				g_free (local_file);
+
+				return NULL;
+			}
 			g_free (command);
 		}
 	}
diff --git a/gthumb/gio-utils.c b/gthumb/gio-utils.c
index 5de7c29..625f099 100644
--- a/gthumb/gio-utils.c
+++ b/gthumb/gio-utils.c
@@ -2206,7 +2206,7 @@ _g_file_create_unique (GFile       *parent,
 	GFile             *file = NULL;
 	GError            *local_error = NULL;
 	int                n;
-	GFileOutputStream *stream;
+	GFileOutputStream *stream = NULL;
 
 	file = g_file_get_child_for_display_name (parent, display_name, &local_error);
 	n = 0;
diff --git a/gthumb/gth-file-source-vfs.c b/gthumb/gth-file-source-vfs.c
index 456d380..dc2eb98 100644
--- a/gthumb/gth-file-source-vfs.c
+++ b/gthumb/gth-file-source-vfs.c
@@ -413,6 +413,7 @@ monitor_changed_cb (GFileMonitor      *file_monitor,
 
 	switch (file_event_type) {
 	case G_FILE_MONITOR_EVENT_CREATED:
+	default:
 		event_type = GTH_MONITOR_EVENT_CREATED;
 		break;
 
@@ -424,11 +425,6 @@ monitor_changed_cb (GFileMonitor      *file_monitor,
 	case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
 		event_type = GTH_MONITOR_EVENT_CHANGED;
 		break;
-
-	case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-	case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
-	case G_FILE_MONITOR_EVENT_UNMOUNTED:
-		return;
 	}
 
 #ifdef DEBUG_MONITOR
diff --git a/gthumb/gth-icon-cache.c b/gthumb/gth-icon-cache.c
index 8f5b6e4..f420d3f 100644
--- a/gthumb/gth-icon-cache.c
+++ b/gthumb/gth-icon-cache.c
@@ -19,7 +19,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  */
- 
+
 #include <config.h>
 #include "glib-utils.h"
 #include "gth-icon-cache.h"
@@ -37,35 +37,35 @@ struct _GthIconCache {
 };
 
 
-GthIconCache * 
+GthIconCache *
 gth_icon_cache_new (GtkIconTheme *icon_theme,
 		    int           icon_size)
 {
 	GthIconCache *icon_cache;
-	
+
 	g_return_val_if_fail (icon_theme != NULL, NULL);
-	
+
 	icon_cache = g_new0 (GthIconCache, 1);
 	icon_cache->icon_theme = icon_theme;
 	icon_cache->icon_size = icon_size;
 	icon_cache->cache = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-	
+
 	g_hash_table_insert (icon_cache->cache, VOID_PIXBUF_KEY, create_void_pixbuf (icon_cache->icon_size, icon_cache->icon_size));
-	
+
 	return icon_cache;
 }
 
 
-GthIconCache * 
+GthIconCache *
 gth_icon_cache_new_for_widget (GtkWidget   *widget,
 	                       GtkIconSize  icon_size)
 {
 	GtkIconTheme *icon_theme;
 	int           pixel_size;
-	
+
 	icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
 	pixel_size = _gtk_icon_get_pixel_size (widget, GTK_ICON_SIZE_MENU);
-	
+
 	return gth_icon_cache_new (icon_theme, pixel_size);
 }
 
@@ -84,18 +84,18 @@ static const char *
 _gth_icon_cache_get_icon_key (GIcon *icon)
 {
 	const char *key = NULL;
-	
+
 	if (G_IS_THEMED_ICON (icon)) {
 		char **icon_names;
 		char  *name;
-	
+
 		g_object_get (icon, "names", &icon_names, NULL);
 		name = g_strjoinv (",", icon_names);
-		
+
 		key = get_static_string (name);
-		
+
 		g_free (name);
-		g_strfreev (icon_names);	
+		g_strfreev (icon_names);
 	}
 	else if (G_IS_FILE_ICON (icon)) {
 		GFile *file;
@@ -103,38 +103,39 @@ _gth_icon_cache_get_icon_key (GIcon *icon)
 
 		file = g_file_icon_get_file (G_FILE_ICON (icon));
 		filename = g_file_get_path (file);
-		
+
 		key = get_static_string (filename);
-		
+
 		g_free (filename);
 		g_object_unref (file);
 	}
-	
+
 	return key;
 }
 
-                  
+
 GdkPixbuf *
 gth_icon_cache_get_pixbuf (GthIconCache *icon_cache,
 			   GIcon        *icon)
 {
 	const char *key;
 	GdkPixbuf  *pixbuf;
-	
+
+	key = NULL;
 	if (icon != NULL)
 		key = _gth_icon_cache_get_icon_key (icon);
-	
+
 	if (key == NULL)
 		key = VOID_PIXBUF_KEY;
 
 	performance (DEBUG_INFO, "get pixbuf for %s", key);
-	
+
 	pixbuf = g_hash_table_lookup (icon_cache->cache, key);
 	if (pixbuf != NULL) {
 		g_object_ref (pixbuf);
 		return pixbuf;
 	}
-	
+
 	if (icon == NULL) {
 		GIcon *unknown_icon;
 
@@ -146,8 +147,8 @@ gth_icon_cache_get_pixbuf (GthIconCache *icon_cache,
 	else
 		pixbuf = _g_icon_get_pixbuf (icon, icon_cache->icon_size, icon_cache->icon_theme);
 	g_hash_table_insert (icon_cache->cache, (gpointer) key, g_object_ref (pixbuf));
-	
+
 	performance (DEBUG_INFO, "done (not cached)");
-	
+
 	return pixbuf;
 }
diff --git a/gthumb/gth-overwrite-dialog.c b/gthumb/gth-overwrite-dialog.c
index 56afac4..556d9f7 100644
--- a/gthumb/gth-overwrite-dialog.c
+++ b/gthumb/gth-overwrite-dialog.c
@@ -218,6 +218,7 @@ gth_overwrite_dialog_construct (GthOverwriteDialog   *self,
 
 	switch (default_response) {
 	case GTH_OVERWRITE_RESPONSE_YES:
+	default:
 		overwrite_radiobutton = _gtk_builder_get_widget (self->priv->builder, "overwrite_yes_radiobutton");
 		break;
 	case GTH_OVERWRITE_RESPONSE_NO:
diff --git a/gthumb/gth-test-simple.c b/gthumb/gth-test-simple.c
index 1b023f1..18347ff 100644
--- a/gthumb/gth-test-simple.c
+++ b/gthumb/gth-test-simple.c
@@ -752,6 +752,7 @@ gth_test_simple_real_update_from_control (GthTest  *base,
 
 	switch (self->priv->data_type) {
 	case GTH_TEST_DATA_TYPE_NONE:
+	default:
 		retval = TRUE;
 		break;
 	case GTH_TEST_DATA_TYPE_INT:
diff --git a/gthumb/gth-user-dir.c b/gthumb/gth-user-dir.c
index ad1e3d3..7b69416 100644
--- a/gthumb/gth-user-dir.c
+++ b/gthumb/gth-user-dir.c
@@ -37,6 +37,7 @@ gth_user_dir_get_file_va_list (GthDir      dir_type,
 	const char *element;
 	char       *filename;
 
+	user_dir = NULL;
 	switch (dir_type) {
 	case GTH_DIR_CONFIG:
 		user_dir = g_get_user_config_dir ();
diff --git a/gthumb/gtk-utils.c b/gthumb/gtk-utils.c
index 0b0690e..4cae780 100644
--- a/gthumb/gtk-utils.c
+++ b/gthumb/gtk-utils.c
@@ -723,6 +723,7 @@ _g_icon_get_pixbuf (GIcon        *icon,
 	if (icon == NULL)
 		return NULL;
 
+	pixbuf = NULL;
 	if (G_IS_THEMED_ICON (icon))
 		pixbuf = get_themed_icon_pixbuf (G_THEMED_ICON (icon), size, theme);
 	if (G_IS_FILE_ICON (icon))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]