rpms/gtk2/devel gtk+-2.10.4-search.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 add-translations.pl, 1.1, 1.2 gtk2.spec, 1.185, 1.186 sources, 1.65, 1.66

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25486

Modified Files:
	.cvsignore add-translations.pl gtk2.spec sources 
Added Files:
	gtk+-2.10.4-search.patch 
Log Message:
2.10.4


gtk+-2.10.4-search.patch:
 gtkfilechooserdefault.c | 1544 ++++++++++++++++++++++++++++++++++++++----------
 gtkfilechooserprivate.h |   42 +
 2 files changed, 1288 insertions(+), 298 deletions(-)

--- NEW FILE gtk+-2.10.4-search.patch ---
--- gtk+-2.10.4/gtk/gtkfilechooserprivate.h.search	2006-09-04 16:54:38.000000000 -0400
+++ gtk+-2.10.4/gtk/gtkfilechooserprivate.h	2006-09-23 14:19:49.000000000 -0400
@@ -147,6 +147,20 @@
   LOCATION_MODE_FILENAME_ENTRY
 } LocationMode;
 
+typedef enum {
+  OPERATION_MODE_BROWSE,
+  OPERATION_MODE_SEARCH
+} OperationMode;
+
+typedef struct _BeagleHit BeagleHit;
+typedef struct _BeagleQuery BeagleQuery;
+typedef struct _BeagleClient BeagleClient;
+typedef struct _BeagleRequest BeagleRequest;
+typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
+typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
+typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
+typedef struct _BeagleQueryPart BeagleQueryPart;
+
 struct _GtkFileChooserDefault
 {
   GtkVBox parent_instance;
@@ -175,11 +189,19 @@
   GtkWidget *browse_files_popup_menu_add_shortcut_item;
   GtkWidget *browse_files_popup_menu_hidden_files_item;
   GtkWidget *browse_new_folder_button;
+  GtkWidget *browse_path_bar_hbox;
   GtkWidget *browse_path_bar;
 
   GtkFileSystemModel *browse_files_model;
   char *browse_files_last_selected_name;
 
+  /* Widgets for searching */
+  GtkWidget *search_hbox;
+  GtkWidget *search_entry;
+  BeagleClient *search_client;
+  BeagleQuery *search_query;
+  GtkListStore *search_model;
+
   GtkWidget *filter_combo_hbox;
   GtkWidget *filter_combo;
   GtkWidget *preview_box;
@@ -195,7 +217,16 @@
   LocationMode location_mode;
 
   GtkListStore *shortcuts_model;
-  GtkTreeModel *shortcuts_filter_model;
+
+  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
+   * the separator that we use for the "Save in folder" combo.
+   */
+  GtkTreeModel *shortcuts_pane_filter_model;
+  
+  /* Filter for the "Save in folder" combo.  We filter out the Search row and
+   * its separator.
+   */
+  GtkTreeModel *shortcuts_combo_filter_model;
 
   GtkTreeModelSort *sort_model;
 
@@ -215,6 +246,8 @@
   ReloadState reload_state;
   guint load_timeout_id;
 
+  OperationMode operation_mode;
+
   GSList *pending_select_paths;
 
   GtkFileFilter *current_filter;
@@ -222,9 +255,6 @@
 
   GtkTooltips *tooltips;
 
-  gboolean has_home;
-  gboolean has_desktop;
-
   int num_volumes;
   int num_shortcuts;
   int num_bookmarks;
@@ -239,6 +269,7 @@
 
   GtkTreeViewColumn *list_name_column;
   GtkCellRenderer *list_name_renderer;
+  GtkTreeViewColumn *list_mtime_column;
 
   GSource *edited_idle;
   char *edited_new_text;
@@ -265,6 +296,9 @@
   guint list_sort_ascending : 1;
   guint changing_folder : 1;
   guint shortcuts_current_folder_active : 1;
+  guint has_home : 1;
+  guint has_desktop : 1;
+  guint has_search : 1;
 
 #if 0
   guint shortcuts_drag_outside : 1;
--- gtk+-2.10.4/gtk/gtkfilechooserdefault.c.search	2006-09-22 12:32:45.000000000 -0400
+++ gtk+-2.10.4/gtk/gtkfilechooserdefault.c	2006-09-23 16:16:22.000000000 -0400
@@ -78,6 +78,8 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 
 
@@ -171,13 +173,20 @@
   SHORTCUTS_COL_PIXBUF,
   SHORTCUTS_COL_NAME,
   SHORTCUTS_COL_DATA,
-  SHORTCUTS_COL_IS_VOLUME,
+  SHORTCUTS_COL_TYPE,
   SHORTCUTS_COL_REMOVABLE,
   SHORTCUTS_COL_PIXBUF_VISIBLE,
   SHORTCUTS_COL_HANDLE,
   SHORTCUTS_COL_NUM_COLUMNS
 };
 
+typedef enum {
+  SHORTCUT_TYPE_PATH,
+  SHORTCUT_TYPE_VOLUME,
+  SHORTCUT_TYPE_SEPARATOR,
+  SHORTCUT_TYPE_SEARCH
+} ShortcutType;
+
 /* Column numbers for the file list */
 enum {
   FILE_LIST_COL_NAME,
@@ -186,6 +195,16 @@
   FILE_LIST_COL_NUM_COLUMNS
 };
 
+/* Column numbers for the search model.  
+ * Keep this in sync with search_setup_model() 
+ */
+enum {
+  SEARCH_MODEL_COL_PATH,
+  SEARCH_MODEL_COL_DISPLAY_NAME,
+  SEARCH_MODEL_COL_COLLATION_KEY,
+  SEARCH_MODEL_COL_STAT
+};
+
 /* Identifiers for target types */
 enum {
   GTK_TREE_MODEL_ROW,
@@ -225,9 +244,137 @@
 static const int num_file_list_dest_targets = (sizeof (file_list_dest_targets)
 					       / sizeof (file_list_dest_targets[0]));
 
+/* We dlopen() all the following from libbeagle at runtime */
+#define BEAGLE_HIT(x) ((BeagleHit *)(x))
+#define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest))
+#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart))
+
+typedef enum {
+        BEAGLE_QUERY_PART_LOGIC_REQUIRED   = 1,
+	BEAGLE_QUERY_PART_LOGIC_PROHIBITED = 2
+} BeagleQueryPartLogic;
+
+typedef enum {
+	BEAGLE_PROPERTY_TYPE_UNKNOWN = 0,
+	BEAGLE_PROPERTY_TYPE_TEXT    = 1,
+	BEAGLE_PROPERTY_TYPE_KEYWORD = 2,
+	BEAGLE_PROPERTY_TYPE_DATE    = 3,
+	BEAGLE_PROPERTY_TYPE_LAST    = 4
+} BeaglePropertyType;
+
+/* *static* wrapper function pointers */
+static gboolean (*beagle_client_send_request_async) (BeagleClient  *client,
+                                                    BeagleRequest  *request,
+                                                    GError        **err) = NULL;
+static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
+static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
+static BeagleQuery *(*beagle_query_new) (void) = NULL;
+static void (*beagle_query_add_text) (BeagleQuery     *query,
+				      const char      *str) = NULL;
+static void (*beagle_query_add_hit_type) (BeagleQuery *query,
+					  const char  *hit_type) = NULL;
+static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL;
+static void (*beagle_query_part_set_logic) (BeagleQueryPart      *part, 
+					    BeagleQueryPartLogic  logic) = NULL;
+static void (*beagle_query_part_property_set_key) (BeagleQueryPartProperty *part, 
+						   const char              *key) = NULL;
+static void (*beagle_query_part_property_set_value) (BeagleQueryPartProperty *part, 
+						     const char *             value) = NULL;
+static void (*beagle_query_part_property_set_property_type) (BeagleQueryPartProperty *part, 
+							     BeaglePropertyType       prop_type) = NULL;
+static void (*beagle_query_add_part) (BeagleQuery     *query, 
+				      BeagleQueryPart *part) = NULL;
+static GType (*beagle_request_get_type) (void) = NULL;
+static GType (*beagle_query_part_get_type) (void) = NULL;
+static gboolean (*beagle_util_daemon_is_running) (void) = NULL;
+static BeagleClient *(*beagle_client_new_real) (const char *client_name) = NULL;
+
+static struct BeagleDlMapping
+{
[...2175 lines suppressed...]
 
       return;
@@ -8434,6 +9359,7 @@
   g_object_set (cell,
 		"text", gtk_file_info_get_display_name (info),
 		"sensitive", sensitive,
+		"ellipsize", PANGO_ELLIPSIZE_END,
 		NULL);
 }
 
@@ -8495,7 +9421,6 @@
 		      gpointer           data)
 {
   GtkFileChooserDefault *impl;
-  const GtkFileInfo *info;
   GtkFileTime time_mtime;
   GDate mtime, now;
   int days_diff;
@@ -8504,17 +9429,35 @@
 
   impl = data;
 
-  info = get_list_file_info (impl, iter);
-  if (!info)
+  if (impl->operation_mode == OPERATION_MODE_SEARCH)
     {
-      g_object_set (cell,
-		    "text", "",
-		    "sensitive", TRUE,
-		    NULL);
-      return;
+      struct stat *statbuf;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (impl->search_model), iter,
+			  SEARCH_MODEL_COL_STAT, &statbuf,
+			  -1);
+      time_mtime = statbuf->st_mtime;
     }
+  else
+    {
+      const GtkFileInfo *info;
+
+      info = get_list_file_info (impl, iter);
+      if (!info)
+	{
+	  g_object_set (cell,
+			"text", "",
+			"sensitive", TRUE,
+			NULL);
+	  return;
+	}
 
-  time_mtime = gtk_file_info_get_modification_time (info);
+      time_mtime = gtk_file_info_get_modification_time (info);
+
+      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+	  impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+	sensitive = gtk_file_info_get_is_folder (info);
+    }
 
   if (time_mtime == 0)
     strcpy (buf, _("Unknown"));
@@ -8545,10 +9488,6 @@
 	}
     }
 
-  if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
-      impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-    sensitive = gtk_file_info_get_is_folder (info);
-
   g_object_set (cell,
 		"text", buf,
 		"sensitive", sensitive,
@@ -8574,7 +9513,23 @@
 static void
 location_popup_handler (GtkFileChooserDefault *impl,
 			const gchar           *path)
-{
+{ 
+  if (impl->operation_mode == OPERATION_MODE_SEARCH)
+    {
+      GtkWidget *widget_to_focus;
+
+      search_switch_to_browse_mode (impl); /* This will give us the location widgets back */
+      if (impl->current_folder)
+        change_folder_and_display_error (impl, impl->current_folder);
+
+      if (impl->location_mode == LOCATION_MODE_PATH_BAR)
+        widget_to_focus = impl->browse_files_tree_view;
+      else
+        widget_to_focus = impl->location_entry;
+
+      gtk_widget_grab_focus (widget_to_focus);
+      return; 
+    }
   if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
       || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
     {
@@ -8643,6 +9598,7 @@
     g_assert_not_reached ();
 
   shortcuts_activate_iter (impl, &iter);
+  focus_browse_tree_view_if_possible (impl);
 }
 
 /* Handler for the "home-folder" keybinding signal */
@@ -8687,26 +9643,26 @@
 /* Drag and drop interfaces */
 
 static void
-_shortcuts_model_filter_class_init (ShortcutsModelFilterClass *class)
+_shortcuts_pane_model_filter_class_init (ShortcutsPaneModelFilterClass *class)
 {
 }
 
 static void
-_shortcuts_model_filter_init (ShortcutsModelFilter *model)
+_shortcuts_pane_model_filter_init (ShortcutsPaneModelFilter *model)
 {
   model->impl = NULL;
 }
 
 /* GtkTreeDragSource::row_draggable implementation for the shortcuts filter model */
 static gboolean
-shortcuts_model_filter_row_draggable (GtkTreeDragSource *drag_source,
-				      GtkTreePath       *path)
+shortcuts_pane_model_filter_row_draggable (GtkTreeDragSource *drag_source,
+				           GtkTreePath       *path)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
   int pos;
   int bookmarks_pos;
 
-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+  model = SHORTCUTS_PANE_MODEL_FILTER (drag_source);
 
   pos = *gtk_tree_path_get_indices (path);
   bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
@@ -8716,13 +9672,13 @@
 
 /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
 static gboolean
-shortcuts_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
-				      GtkTreePath       *path,
-				      GtkSelectionData  *selection_data)
+shortcuts_pane_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
+				           GtkTreePath       *path,
+				           GtkSelectionData  *selection_data)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
 
-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+  model = SHORTCUTS_PANE_MODEL_FILTER (drag_source);
 
   /* FIXME */
 
@@ -8731,30 +9687,30 @@
 
 /* Fill the GtkTreeDragSourceIface vtable */
 static void
-shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
+shortcuts_pane_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
 {
-  iface->row_draggable = shortcuts_model_filter_row_draggable;
-  iface->drag_data_get = shortcuts_model_filter_drag_data_get;
+  iface->row_draggable = shortcuts_pane_model_filter_row_draggable;
+  iface->drag_data_get = shortcuts_pane_model_filter_drag_data_get;
 }
 
 #if 0
 /* Fill the GtkTreeDragDestIface vtable */
 static void
-shortcuts_model_filter_drag_dest_iface_init (GtkTreeDragDestIface *iface)
+shortcuts_pane_model_filter_drag_dest_iface_init (GtkTreeDragDestIface *iface)
 {
-  iface->drag_data_received = shortcuts_model_filter_drag_data_received;
-  iface->row_drop_possible = shortcuts_model_filter_row_drop_possible;
+  iface->drag_data_received = shortcuts_pane_model_filter_drag_data_received;
+  iface->row_drop_possible = shortcuts_pane_model_filter_row_drop_possible;
 }
 #endif
 
 static GtkTreeModel *
-shortcuts_model_filter_new (GtkFileChooserDefault *impl,
-			    GtkTreeModel          *child_model,
-			    GtkTreePath           *root)
+shortcuts_pane_model_filter_new (GtkFileChooserDefault *impl,
+			         GtkTreeModel          *child_model,
+			         GtkTreePath           *root)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
 
-  model = g_object_new (SHORTCUTS_MODEL_FILTER_TYPE,
+  model = g_object_new (SHORTCUTS_PANE_MODEL_FILTER_TYPE,
 			"child-model", child_model,
 			"virtual-root", root,
 			NULL);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	5 Sep 2006 13:49:45 -0000	1.60
+++ .cvsignore	23 Sep 2006 21:07:14 -0000	1.61
@@ -43,3 +43,4 @@
 gtk+-2.10.1.tar.bz2
 gtk+-2.10.2.tar.bz2
 gtk+-2.10.3.tar.bz2
+gtk+-2.10.4.tar.bz2


Index: add-translations.pl
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/add-translations.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- add-translations.pl	19 Sep 2006 16:48:42 -0000	1.1
+++ add-translations.pl	23 Sep 2006 21:07:14 -0000	1.2
@@ -3,360 +3,420 @@
 
 open (FILE, '>>', 'be.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на вузьле %2$s"
 EOT
 
 open (FILE, '>>', 'bg.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'bn_IN.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s'র উপর"
 EOT
 
 open (FILE, '>>', 'bn.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s'র উপর"
 EOT
 
 open (FILE, '>>', 'br.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s war %2$s"
 EOT
 
 open (FILE, '>>', 'ca.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s a %2$s"
 EOT
 
 open (FILE, '>>', 'cs.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'cy.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s ar %2$s"
 EOT
 
 open (FILE, '>>', 'da.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'de.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s"
 EOT
 
 open (FILE, '>>', 'dz.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s གུ"
 EOT
 
 open (FILE, '>>', 'el.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s σε %2$s"
 EOT
 
 open (FILE, '>>', 'en_CA.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 EOT
 
 open (FILE, '>>', 'en_GB.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 EOT
 
 open (FILE, '>>', 'es.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 EOT
 
 open (FILE, '>>', 'et.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s hostil %1$s"
 EOT
 
 open (FILE, '>>', 'eu.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s"
 EOT
 
 open (FILE, '>>', 'fi.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s - %2$s"
 EOT
 
 open (FILE, '>>', 'fr.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s sur %2$s"
 EOT
 
 open (FILE, '>>', 'gl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 EOT
 
 open (FILE, '>>', 'gu.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s પર"
 EOT
 
 open (FILE, '>>', 'he.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "‏%1$s ב-%2$s"
 EOT
 
 open (FILE, '>>', 'hi.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$s पर"
 EOT
 
 open (FILE, '>>', 'hu.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s ezen: %2$s"
 EOT
 
 open (FILE, '>>', 'id.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s pada %2$s"
 EOT
 
 open (FILE, '>>', 'it.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s su %2$s"
 EOT
 
 open (FILE, '>>', 'ja.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s にある %1$s"
 EOT
 
 open (FILE, '>>', 'ka.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s - %2$s"
 EOT
 
 open (FILE, '>>', 'ko.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%s %s"
 EOT
 
 open (FILE, '>>', 'ku.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s di %2$s de"
 EOT
 
 open (FILE, '>>', 'lt.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s kompiuteryje %2$s"
 EOT
 
 open (FILE, '>>', 'lv.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s uz %2$s"
 EOT
 
 open (FILE, '>>', 'mg.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s amin'ny %2$s"
 EOT
 
 open (FILE, '>>', 'mk.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'ml.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s-ല്‍ %1$s"
 EOT
 
 open (FILE, '>>', 'mn.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s"
 EOT
 
 open (FILE, '>>', 'mr.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%s, %s"
 EOT
 
 open (FILE, '>>', 'nb.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'nl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s op %2$s"
 EOT
 
 open (FILE, '>>', 'nn.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'or.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$sରେ"
 EOT
 
 open (FILE, '>>', 'pa.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s ਉੱਤੇ %1$s"
 EOT
 
 open (FILE, '>>', 'pl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'pt_BR.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s em %2$s"
 EOT
 
 open (FILE, '>>', 'pt.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s em %2$s"
 EOT
 
 open (FILE, '>>', 'ro.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s pe %2$s"
 EOT
 
 open (FILE, '>>', 'ru.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'sk.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'sl.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'sq.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s mbi %2$s"
 EOT
 
 open (FILE, '>>', 'sr Latn po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 EOT
 
 open (FILE, '>>', 'sr.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'sv.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 EOT
 
 open (FILE, '>>', 'ta.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 EOT
 
 open (FILE, '>>', 'th.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s ที่ %2$s"
 EOT
 
 open (FILE, '>>', 'uk.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 EOT
 
 open (FILE, '>>', 'vi.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s trên %2$s"
 EOT
 
 open (FILE, '>>', 'zh_CN.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 EOT
 
 open (FILE, '>>', 'zh_HK.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s 於 %2$s"
 EOT
 
 open (FILE, '>>', 'zh_TW.po');
 print FILE <<'EOT';
+
 msgid "%1$s on %2$s"
 msgstr "%1$s 於 %2$s"
 EOT


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- gtk2.spec	19 Sep 2006 16:50:12 -0000	1.185
+++ gtk2.spec	23 Sep 2006 21:07:14 -0000	1.186
@@ -10,41 +10,29 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.10.3
+%define base_version 2.10.4
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
 Source1: update-scripts.tar.gz
-# This script belongs to patch 13
-Source2: add-translations.pl
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Filechooser search
-Patch2: gtk+-2.10.3-search.patch
+Patch2: gtk+-2.10.4-search.patch
 # use fam for recent-files
 Patch3: gtk+-2.10.3-fam.patch
 
 # backport from HEAD
 Patch7: gtk+-2.10.2-cursor-blink.patch
-Patch8: gtk+-2.10.2-im-reset.patch
-
-# fixed in upstream cvs
-Patch9: gtk+-2.10.3-sylpheed-crash.patch
-Patch10: gtk+-2.10.3-desktop.patch
-Patch11: gtk+-2.10.3-gedit-color-picker.patch
-Patch12: gtk+-2.10.3-parent-walk.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=354887
-Patch13: gtk+-2.10.3-auth-dialogs.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -65,8 +53,6 @@
 BuildRequires: libXinerama-devel
 # for patch 3
 BuildRequires: gamin-devel
-# for Source2
-BuildRequires: perl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gtk+-gtkbeta
@@ -111,6 +97,7 @@
 Requires: libX11-devel, libXcursor-devel, libXinerama-devel
 Requires: libXext-devel, libXi-devel, libXrandr-devel
 Requires: libXfixes-devel
+Requires: pkgconfig
 Obsoletes: gtk+-gtkbeta-devel
 Obsoletes: Inti-devel
 ## avoid header collisions
@@ -132,16 +119,6 @@
 %patch3 -p1 -b .fam
 
 %patch7 -p0 -b .cursor-blink
-%patch8 -p1 -b .im-reset
-%patch9 -p1 -b .sylpheed-crash
-%patch10 -p1 -b .desktop
-%patch11 -p1 -b .gedit-color-picker
-%patch12 -p1 -b .parent-walk
-%patch13 -p1 -b .auth-dialogs
-
-pushd po/
-perl %{SOURCE2}
-popd
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -315,6 +292,12 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sat Sep 23 2006 Matthias Clasen <mclasen redhat com> - 2.10.4-1
+- Update to 2.10.4
+- Drop upstreamed patches
+- Update the search patch
+- Require pkgconfig in the -devel package
+
 * Tue Sep 19 2006 Matthias Clasen <mclasen redhat com> - 2.10.3-7
 - Fix issues with auth dialogs in the file chooser
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	5 Sep 2006 13:49:46 -0000	1.65
+++ sources	23 Sep 2006 21:07:14 -0000	1.66
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-c662ca204e204edfd8b8b917b9a852aa  gtk+-2.10.3.tar.bz2
+ecfcbdc0d23eb7a596b1d58b48838b18  gtk+-2.10.4.tar.bz2