X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fcallbacks.c;h=8fd2b7a94ed02a5ea4ae324d2928089996350fec;hb=5f753d54ac498a7d363f82ee1203b182ec4bb310;hp=b0ef9b592ecd7580646b70a4f7cae5a9ad80ed66;hpb=cc1e6bbf1254f28b083c291396c0e295811b5159;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index b0ef9b59..8fd2b7a9 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -446,6 +446,16 @@ ghb_volname_cache_init(void)
 										free_volname_key, free_volname_value);
 }
 
+static void
+free_drive(gpointer drive)
+{
+#if defined(_WIN32)
+		g_free(drive);
+#else
+		g_object_unref(drive);
+#endif
+}
+
 gpointer
 ghb_cache_volnames(signal_user_data_t *ud)
 {
@@ -485,11 +495,7 @@ ghb_cache_volnames(signal_user_data_t *ud)
 				g_free(name);
 		}
 	
-#if defined(_WIN32)
-		g_free(link->data);
-#else
-		g_object_unref(link->data);
-#endif
+		free_drive(link->data);
 		link = link->next;
 	}
 	g_mutex_unlock(volname_mutex);
@@ -801,7 +807,7 @@ source_dialog_extra_widgets(
 		gchar *name = get_dvd_device_name(link->data);
 		gtk_combo_box_append_text(combo, name);
 		g_free(name);
-		g_object_unref(link->data);
+		free_drive(link->data);
 		link = link->next;
 	}
 	g_list_free(drives);
@@ -3032,11 +3038,7 @@ ghb_file_menu_add_dvd(signal_user_data_t *ud)
 				(GCallback)dvd_source_activate_cb, ud);
 			g_free(name);
 			g_free(drive);
-#if defined(_WIN32)
-			g_free(link->data);
-#else
-			g_object_unref(link->data);
-#endif
+			free_drive(link->data);
 			link = link->next;
 		}
 		g_list_free(drives);