X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Ficons.c;h=9054976310ebd0a56cf6eef3cdadd080ef8641af;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=ed5545451d188d474eb707d4abc6769554dad564;hpb=1b540525da5def2381a6c79b634a94b18f2717ce;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/icons.c b/gtk/src/icons.c
index ed554545..90549763 100644
--- a/gtk/src/icons.c
+++ b/gtk/src/icons.c
@@ -3,7 +3,6 @@
 #include "values.h"
 #include "resources.h"
 
-#if 1
 void
 ghb_load_icons()
 {
@@ -40,31 +39,3 @@ ghb_load_icons()
 		gdk_pixbuf_unref(pb);
 	}
 }
-
-#else
-
-void
-ghb_load_icons()
-{
-	GdkPixbuf *pb;
-	GHashTableIter iter;
-	gchar *name;
-	GValue *gval;
-	ghb_rawdata_t *rd;
-	gint size;
-
-	GValue *icons = ghb_resource_get("icons");
-	ghb_dict_iter_init(&iter, icons);
-	// middle (void*) cast prevents gcc warning "defreferencing type-punned
-	// pointer will break strict-aliasing rules"
-	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&name, (gpointer*)(void*)&gval))
-	{
-		rd = g_value_get_boxed(gval);
-		pb = icon_deserialize(rd->data, rd->size);
-		size = gdk_pixbuf_get_height(pb);
-		gtk_icon_theme_add_builtin_icon(name, size, pb);
-		gdk_pixbuf_unref(pb);
-	}
-}
-#endif