gtk+ r20421 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Jun 17 12:54:16 2008
New Revision: 20421
URL: http://svn.gnome.org/viewvc/gtk+?rev=20421&view=rev

Log:
2008-06-17  Michael Natterer  <mitch imendio com>

	* gtk/gtkfilechooserdefault.c: remove static integer variables
	which hold the number of members in GtkTargetEntry arrays and use
	G_N_ELEMENTS() directly instead.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfilechooserdefault.c

Modified: trunk/gtk/gtkfilechooserdefault.c
==============================================================================
--- trunk/gtk/gtkfilechooserdefault.c	(original)
+++ trunk/gtk/gtkfilechooserdefault.c	Tue Jun 17 12:54:16 2008
@@ -234,37 +234,27 @@
   { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }
 };
 
-static const int num_shortcuts_source_targets = G_N_ELEMENTS (shortcuts_source_targets); 
-
 /* Target types for dropping into the shortcuts list */
 static const GtkTargetEntry shortcuts_dest_targets[] = {
   { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW },
   { "text/uri-list", 0, TEXT_URI_LIST }
 };
 
-static const int num_shortcuts_dest_targets = G_N_ELEMENTS (shortcuts_dest_targets); 
-
 /* Target types for DnD from the file list */
 static const GtkTargetEntry file_list_source_targets[] = {
   { "text/uri-list", 0, TEXT_URI_LIST }
 };
 
-static const int num_file_list_source_targets = G_N_ELEMENTS (file_list_source_targets); 
-
 /* Target types for dropping into the file list */
 static const GtkTargetEntry file_list_dest_targets[] = {
   { "text/uri-list", GTK_TARGET_OTHER_WIDGET, TEXT_URI_LIST }
 };
 
-static const int num_file_list_dest_targets = G_N_ELEMENTS (file_list_dest_targets); 
-
 /* Target types for dragging from the recent files list */
 static const GtkTargetEntry recent_list_source_targets[] = {
   { "text/uri-list", 0, TEXT_URI_LIST }
 };
 
-static const int num_recent_list_source_targets = G_N_ELEMENTS (recent_list_source_targets);
-
 static gboolean
 search_is_possible (GtkFileChooserDefault *impl)
 {
@@ -3884,13 +3874,13 @@
   gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
 					  GDK_BUTTON1_MASK,
 					  shortcuts_source_targets,
-					  num_shortcuts_source_targets,
+					  G_N_ELEMENTS (shortcuts_source_targets),
 					  GDK_ACTION_MOVE);
 
   gtk_drag_dest_set (impl->browse_shortcuts_tree_view,
 		     GTK_DEST_DEFAULT_ALL,
 		     shortcuts_dest_targets,
-		     num_shortcuts_dest_targets,
+		     G_N_ELEMENTS (shortcuts_dest_targets),
 		     GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
@@ -4539,7 +4529,7 @@
   gtk_drag_dest_set (impl->browse_files_tree_view,
                      GTK_DEST_DEFAULT_ALL,
                      file_list_dest_targets,
-                     num_file_list_dest_targets,
+                     G_N_ELEMENTS (file_list_dest_targets),
                      GDK_ACTION_COPY | GDK_ACTION_MOVE);
   
   g_signal_connect (impl->browse_files_tree_view, "row_activated",
@@ -4569,7 +4559,7 @@
   gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_files_tree_view),
 					  GDK_BUTTON1_MASK,
 					  file_list_source_targets,
-					  num_file_list_source_targets,
+					  G_N_ELEMENTS (file_list_source_targets),
 					  GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
   g_signal_connect (selection, "changed",