SF.net SVN: geany:[3967] trunk

[ntrel at users.sourceforge.net]

Revision: 3967
          http://geany.svn.sourceforge.net/geany/?rev=3967&view=rev
Author:   ntrel
Date:     2009-07-14 15:14:38 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Remove filetypes_foreach_named().

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/filetypes.c
    trunk/src/filetypes.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-14 15:06:20 UTC (rev 3966)
+++ trunk/ChangeLog	2009-07-14 15:14:38 UTC (rev 3967)
@@ -24,6 +24,8 @@
    plugins to use it.
    Add sci_set_font() to API.
    Update plugin howto.
+ * src/filetypes.c, src/filetypes.h:
+   Remove filetypes_foreach_named().
 
 
 2009-07-13  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2009-07-14 15:06:20 UTC (rev 3966)
+++ trunk/src/filetypes.c	2009-07-14 15:14:38 UTC (rev 3967)
@@ -696,16 +696,9 @@
 }
 
 
-static void add_ft_menu_item(gpointer pft, gpointer user_data)
-{
-	GeanyFiletype *ft = pft;
-
-	create_radio_menu_item(group_menus[ft->group], ft);
-}
-
-
 static void create_set_filetype_menu(void)
 {
+	GSList *node;
 	GtkWidget *filetype_menu = ui_lookup_widget(main_widgets.window, "set_filetype1_menu");
 
 	create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_COMPILED, _("_Programming Languages"));
@@ -714,7 +707,13 @@
 	create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_MISC, _("M_iscellaneous Languages"));
 
 	/* Append all filetypes to the filetype menu */
-	filetypes_foreach_named(add_ft_menu_item, NULL);
+	foreach_slist(node, filetypes_by_title)
+	{
+		GeanyFiletype *ft = node->data;
+
+		if (ft->id != GEANY_FILETYPES_NONE)
+			create_radio_menu_item(group_menus[ft->group], ft);
+	}
 	create_radio_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_NONE]);
 }
 
@@ -1493,19 +1492,3 @@
 {
 	return (idx >= 0 && idx < (gint) filetypes_array->len) ? filetypes[idx] : NULL;
 }
-
-
-/* Does not include ft[GEANY_FILETYPES_NONE], as this is usually treated specially. */
-void filetypes_foreach_named(GFunc callback, gpointer user_data)
-{
-	GSList *node;
-
-	foreach_slist(node, filetypes_by_title)
-	{
-		GeanyFiletype *ft = node->data;
-
-		if (G_LIKELY(ft->id != GEANY_FILETYPES_NONE))
-			callback(ft, user_data);
-	}
-}
-

Modified: trunk/src/filetypes.h
===================================================================
--- trunk/src/filetypes.h	2009-07-14 15:06:20 UTC (rev 3966)
+++ trunk/src/filetypes.h	2009-07-14 15:14:38 UTC (rev 3967)
@@ -151,8 +151,6 @@
 
 GeanyFiletype *filetypes_lookup_by_name(const gchar *name);
 
-void filetypes_foreach_named(GFunc callback, gpointer user_data);
-
 GeanyFiletype *filetypes_find(GCompareFunc predicate, gpointer user_data);
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.