rpms/anjuta/F-10 anjuta-2.24.2-class-gen-add-class.patch, NONE, 1.1 anjuta-2.24.2-class-gen-templates.patch, NONE, 1.1 anjuta-2.24.2-delete-folder-crash.patch, NONE, 1.1 anjuta-2.24.2-hide-python-binaries.patch, NONE, 1.1 anjuta-2.24.2-save-and-exit.patch, NONE, 1.1 anjuta.spec, 1.57, 1.58

Debarshi Ray rishi at fedoraproject.org
Mon Mar 16 20:10:51 UTC 2009 

Author: rishi

Update of /cvs/pkgs/rpms/anjuta/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8088

Modified Files:
	anjuta.spec 
Added Files:
	anjuta-2.24.2-class-gen-add-class.patch 
	anjuta-2.24.2-class-gen-templates.patch 
	anjuta-2.24.2-delete-folder-crash.patch 
	anjuta-2.24.2-hide-python-binaries.patch 
	anjuta-2.24.2-save-and-exit.patch 
Log Message:
* Sun Mar 16 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-2
- Stripped redundant translations from .mo files. (GNOME Bugzilla #474987)
- Backported fix to enable addition of new classes to a project using the
  class generator plugin. (GNOME Bugzilla #559951)
- Backported fix to prevent a crash when a folder within a project is deleted
  from a different application. (GNOME Bugzilla #560284)
- Backported fix to hide .pyc and .pyo files. (GNOME Bugzilla #563530)
- Backported fix to actually save files, modified by the GtkSourceview editor
  plugin, on exit from 2.25.x. (GNOME Bugzilla #574376)
- Added patch against class generator plugin to fix wrong copyright and license
  notices. (GNOME Bugzilla #575147)


anjuta-2.24.2-class-gen-add-class.patch:

--- NEW FILE anjuta-2.24.2-class-gen-add-class.patch ---
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/plugin.c anjuta-2.24.2/plugins/class-gen/plugin.c
--- anjuta-2.24.2.orig/plugins/class-gen/plugin.c	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/plugin.c	2009-03-17 01:16:31.000000000 +0530
@@ -216,14 +216,20 @@ cg_plugin_add_to_project (AnjutaClassGen
 	}
 	else
 	{
-		*new_header_file = added_files->data;
-		*new_source_file = g_list_next (added_files)->data;
+		GFile *file;
+		file = g_file_new_for_uri ((gchar*)added_files->data);
+		*new_header_file = g_file_get_path(file);
+		g_object_unref (file);
+		file = g_file_new_for_uri ((gchar*)g_list_next (added_files)->data);
+		*new_source_file = g_file_get_path(file);
+		g_object_unref (file);
 
 		result = TRUE;
 	}
 
 	g_free (curdir);
 	g_free (dirname);
+	g_list_foreach (added_files, (GFunc)g_free, NULL);
 	g_list_free (added_files);
 	g_list_free (filenames);
 

anjuta-2.24.2-class-gen-templates.patch:

--- NEW FILE anjuta-2.24.2-class-gen-templates.patch ---
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/cc-header.tpl anjuta-2.24.2/plugins/class-gen/templates/cc-header.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/cc-header.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/cc-header.tpl	2009-03-16 01:52:54.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+HeaderFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "HeaderFile")                    " * ")+]
 [+ESAC+] */
 
 #ifndef _[+ (string-upcase(string->c-name!(get "HeaderFile"))) +]_
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/cc-source.tpl anjuta-2.24.2/plugins/class-gen/templates/cc-source.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/cc-source.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/cc-source.tpl	2009-03-16 01:52:25.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+SourceFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "SourceFile")                    " * ")+]
 [+ESAC+] */
 
 #include "[+HeaderFile+]"
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/go-header.tpl anjuta-2.24.2/plugins/class-gen/templates/go-header.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/go-header.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/go-header.tpl	2009-03-16 01:53:26.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+HeaderFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "HeaderFile")                    " * ")+]
 [+ESAC+] */
 
 #ifndef _[+ (string-upcase(string->c-name!(get "HeaderFile"))) +]_
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/go-source.tpl anjuta-2.24.2/plugins/class-gen/templates/go-source.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/go-source.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/go-source.tpl	2009-03-16 01:53:14.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+SourceFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "SourceFile")                    " * ")+]
 [+ESAC+] */
 
 #include "[+HeaderFile+]"[+

anjuta-2.24.2-delete-folder-crash.patch:

--- NEW FILE anjuta-2.24.2-delete-folder-crash.patch ---
diff -urNp anjuta-2.24.2.orig/plugins/file-manager/file-model.c anjuta-2.24.2/plugins/file-manager/file-model.c
--- anjuta-2.24.2.orig/plugins/file-manager/file-model.c	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/file-manager/file-model.c	2009-03-17 00:19:42.000000000 +0530
@@ -106,28 +106,6 @@ file_model_add_dummy (FileModel* model,
 }
 
 static void
-file_model_remove_file (FileModel* model, 
-						GtkTreeIter* iter)
-{
-	GFile* file;
-	GtkTreeRowReference* reference;
-	GFileMonitor* monitor;
-	
-	gtk_tree_model_get (GTK_TREE_MODEL (model), iter,
-						COLUMN_FILE, &file, -1);
-	
-	monitor = g_object_get_data (G_OBJECT(file), "file-monitor");
-	if (monitor)
-		g_object_unref (monitor);
-	
-	reference = g_object_get_data (G_OBJECT(file), "reference");
-	if (reference)
-		gtk_tree_row_reference_free(reference);
-	
-	gtk_tree_store_remove (GTK_TREE_STORE (model), iter);	
-}
-
-static void
 file_model_update_file (FileModel* model,
 						GtkTreeIter* iter,
 						GFile* file,
@@ -201,6 +179,7 @@ on_file_model_changed (GFileMonitor* mon
 	GtkTreeIter file_iter;
 	gboolean found = FALSE;
 	
+	/* reference could be invalid if the file has already been destroyed */
 	if (!gtk_tree_row_reference_valid(reference))
 		return;
 	
@@ -255,7 +234,7 @@ on_file_model_changed (GFileMonitor* mon
 		}
 		case G_FILE_MONITOR_EVENT_DELETED:
 		{
-			file_model_remove_file (model, &file_iter);
+			gtk_tree_store_remove (GTK_TREE_STORE (model), &file_iter);
 			break;
 		}
 		default:
@@ -285,8 +264,9 @@ file_model_add_watch (FileModel* model, 
 	g_signal_connect (monitor, "changed", G_CALLBACK(on_file_model_changed),
 					  reference);
 	
-	g_object_set_data (G_OBJECT(file), "file-monitor", monitor);
-	g_object_set_data (G_OBJECT(file), "reference", reference);	
+	g_object_set_data_full (G_OBJECT(file), "file-monitor", monitor, (GDestroyNotify)g_object_unref);
+	/* Reference is used by monitor, should be kept it until the monitor is destroyed */
+	g_object_set_data_full (G_OBJECT(monitor), "reference", reference, (GDestroyNotify)gtk_tree_row_reference_free);
 	g_object_unref (file);
 }
 
@@ -355,7 +335,7 @@ file_model_row_collapsed (GtkTreeView* t
 
 	while (gtk_tree_model_iter_children (GTK_TREE_MODEL(model), &child, &real_iter))
 	{
-		file_model_remove_file (model, &child);
+		gtk_tree_store_remove (GTK_TREE_STORE (model), &child);
 	}
 	
 	file_model_add_dummy (model, &real_iter);
diff -urNp anjuta-2.24.2.orig/plugins/file-manager/plugin.c anjuta-2.24.2/plugins/file-manager/plugin.c
--- anjuta-2.24.2.orig/plugins/file-manager/plugin.c	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/file-manager/plugin.c	2009-03-17 00:03:40.000000000 +0530
@@ -131,6 +131,7 @@ on_file_view_current_file_changed (Anjut
 		g_value_set_object (value, file);
 		anjuta_shell_add_value (ANJUTA_PLUGIN (file_manager)->shell,
 								IANJUTA_FILE_MANAGER_SELECTED_FILE, value, NULL);
+		g_value_unset (value);
 	}
 	else
 	{

anjuta-2.24.2-hide-python-binaries.patch:

--- NEW FILE anjuta-2.24.2-hide-python-binaries.patch ---
diff -urNp anjuta-2.24.2.orig/plugins/file-manager/file-model.c anjuta-2.24.2/plugins/file-manager/file-model.c
--- anjuta-2.24.2.orig/plugins/file-manager/file-model.c	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/file-manager/file-model.c	2009-03-17 00:35:11.000000000 +0530
@@ -35,6 +35,8 @@ const gchar* BINARY_SUFFIX[] =
 	".lo",
 	".a",
 	".so",
+	".pyc",
+	".pyo",
 	NULL
 };
 

anjuta-2.24.2-save-and-exit.patch:

--- NEW FILE anjuta-2.24.2-save-and-exit.patch ---
diff -urNp anjuta-2.24.2.orig/libanjuta/anjuta-shell.c anjuta-2.24.2/libanjuta/anjuta-shell.c
--- anjuta-2.24.2.orig/libanjuta/anjuta-shell.c	2009-03-16 01:11:44.000000000 +0530
+++ anjuta-2.24.2/libanjuta/anjuta-shell.c	2009-03-16 02:28:29.000000000 +0530
@@ -754,6 +754,36 @@ anjuta_shell_get_profile_manager (Anjuta
 	return ANJUTA_SHELL_GET_IFACE (shell)->get_profile_manager (shell, error);
 }
 
+/**
+ * anjuta_shell_saving_push:
+ * @shell: A #AnjutaShell interface
+ *
+ * Increase the count of files that need to be saved
+ *
+ */
+void
+anjuta_shell_saving_push (AnjutaShell* shell)
+{
+	g_return_if_fail (ANJUTA_IS_SHELL (shell));
+
+	return ANJUTA_SHELL_GET_IFACE (shell)->saving_push (shell);
+}
+
+/**
+ * anjuta_shell_saving_pop:
+ * @shell: A #AnjutaShell interface
+ *
+ * Decrease the count of files that need to be saved
+ *
+ */
+void
+anjuta_shell_saving_pop (AnjutaShell* shell)
+{
+	g_return_if_fail (ANJUTA_IS_SHELL (shell));
+
+	return ANJUTA_SHELL_GET_IFACE (shell)->saving_pop (shell);
+}
+
 void
 anjuta_shell_session_save (AnjutaShell *shell, const gchar *session_directory,
 						   GError **error)
diff -urNp anjuta-2.24.2.orig/libanjuta/anjuta-shell.h anjuta-2.24.2/libanjuta/anjuta-shell.h
--- anjuta-2.24.2.orig/libanjuta/anjuta-shell.h	2009-03-16 01:11:44.000000000 +0530
+++ anjuta-2.24.2/libanjuta/anjuta-shell.h	2009-03-16 02:28:29.000000000 +0530
@@ -108,6 +108,8 @@ struct _AnjutaShellIface {
 	void (*remove_value)      (AnjutaShell  *shell,
 							   const char   *name,
 							   GError       **error);
+	void (*saving_push)       (AnjutaShell  *shell);
+	void (*saving_pop)        (AnjutaShell  *shell);
 	GObject* (*get_object)    (AnjutaShell  *shell,
 							   const char   *iface_name,
 							   GError       **error);
@@ -196,6 +198,8 @@ void anjuta_shell_save_prompt       (Anj
 									 AnjutaSavePrompt *prompt,
 									 GError **error);
 void anjuta_shell_notify_exit       (AnjutaShell *shell, GError **error);
+void anjuta_shell_saving_push       (AnjutaShell *shell);
+void anjuta_shell_saving_pop        (AnjutaShell *shell);
 
 /**
  * anjuta_shell_get_interface:
diff -urNp anjuta-2.24.2.orig/plugins/sourceview/sourceview-io.c anjuta-2.24.2/plugins/sourceview/sourceview-io.c
--- anjuta-2.24.2.orig/plugins/sourceview/sourceview-io.c	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/sourceview/sourceview-io.c	2009-03-16 02:36:16.000000000 +0530
@@ -213,13 +213,16 @@ set_display_name (SourceviewIO* sio)
 }
 
 static void
-on_save_finished (GObject* output_stream, GAsyncResult* result, gpointer data)
+on_save_finished (GObject* file, GAsyncResult* result, gpointer data)
 {
 	SourceviewIO* sio = SOURCEVIEW_IO(data);
+	AnjutaShell* shell = ANJUTA_PLUGIN (sio->sv->priv->plugin)->shell;
 	GError* err = NULL;
-	g_output_stream_write_finish (G_OUTPUT_STREAM(output_stream),
-								  result,
-								  &err);
+	gchar* etag;
+	g_file_replace_contents_finish (G_FILE (file),
+					result,
+					&etag,
+					&err);
 	if (err)
 	{
 		g_signal_emit_by_name (sio, "save-failed", err);
@@ -228,13 +231,13 @@ on_save_finished (GObject* output_stream
 	else
 	{
 		set_display_name (sio);
-		g_output_stream_close(G_OUTPUT_STREAM (output_stream), NULL, NULL);
 		g_signal_emit_by_name (sio, "save-finished");
 		setup_monitor (sio);
 	}
 	g_free (sio->write_buffer);
+	g_free (etag);
 	sio->write_buffer = NULL;
-	g_object_unref (output_stream);
+	anjuta_shell_saving_pop (shell);
 }
 
 void
@@ -255,38 +258,17 @@ sourceview_io_save (SourceviewIO* sio)
 void
 sourceview_io_save_as (SourceviewIO* sio, GFile* file)
 {
-	GFileOutputStream* output_stream;
-	GError* err = NULL;
+	AnjutaShell* shell = ANJUTA_PLUGIN (sio->sv->priv->plugin)->shell;
+	gsize len;
 	g_return_if_fail (file != NULL);
 	
 	cancel_monitor (sio);
 	
-	output_stream = g_file_create (file, G_FILE_CREATE_NONE, NULL, &err);
-	if (!output_stream)
-	{
-		if (err->code != G_IO_ERROR_EXISTS)
-		{
-			g_signal_emit_by_name (sio, "save-failed", err);
-			g_error_free (err);
-			return;
-		}
-		else
-		{
-			output_stream = g_file_replace (file, NULL, TRUE, G_FILE_CREATE_NONE,
-											NULL, NULL);
-			if (!output_stream)
-			{
-				g_signal_emit_by_name (sio, "save-failed", err);
-				g_error_free (err);
-				return;
-			}
-		}
-	}
-	
 	if (sio->last_encoding == NULL)
 	{
 		sio->write_buffer = ianjuta_editor_get_text_all (IANJUTA_EDITOR(sio->sv), 
 														 NULL);
+		len = strlen (sio->write_buffer);
 	}
 	else
 	{
@@ -296,7 +278,7 @@ sourceview_io_save_as (SourceviewIO* sio
 		sio->write_buffer = anjuta_convert_from_utf8 (buffer_text,
 													  -1,
 													  sio->last_encoding,
-													  NULL,
+													  &len,
 													  &err);
 		g_free (buffer_text);
 		if (err != NULL)
@@ -307,13 +289,16 @@ sourceview_io_save_as (SourceviewIO* sio
 		}
 	}
 	g_cancellable_reset (sio->cancel);
-	g_output_stream_write_async (G_OUTPUT_STREAM (output_stream),
-								 sio->write_buffer,
-								 strlen (sio->write_buffer),
-								 G_PRIORITY_LOW,
-								 sio->cancel,
-								 on_save_finished,
-								 sio);
+	g_file_replace_contents_async (file,
+				       sio->write_buffer,
+				       len,
+				       NULL,
+				       FALSE,
+				       G_FILE_CREATE_NONE,
+				       sio->cancel,
+				       on_save_finished,
+				       sio);
+	anjuta_shell_saving_push (shell);
 	
 	if (sio->file != file)
 	{
diff -urNp anjuta-2.24.2.orig/src/anjuta-app.c anjuta-2.24.2/src/anjuta-app.c
--- anjuta-2.24.2.orig/src/anjuta-app.c	2009-03-16 01:11:44.000000000 +0530
+++ anjuta-2.24.2/src/anjuta-app.c	2009-03-16 02:28:29.000000000 +0530
@@ -766,6 +766,8 @@ anjuta_app_instance_init (AnjutaApp *app
 	
 	/* Loading accels */
 	anjuta_ui_load_accels ();
+
+	app->save_count = 0;
 }
 
 static void
@@ -1036,6 +1038,20 @@ anjuta_app_remove_value (AnjutaShell *sh
 	}
 }
 
+static void
+anjuta_app_saving_push (AnjutaShell* shell)
+{
+	AnjutaApp* app = ANJUTA_APP (shell);
+	app->save_count++;
+}
+
+static void
+anjuta_app_saving_pop (AnjutaShell* shell)
+{
+	AnjutaApp* app = ANJUTA_APP (shell);
+	app->save_count--;
+}
+
 static gboolean
 remove_from_widgets_hash (gpointer name, gpointer hash_widget, gpointer widget)
 {
@@ -1319,6 +1335,8 @@ anjuta_shell_iface_init (AnjutaShellIfac
 	iface->get_preferences = anjuta_app_get_preferences;
 	iface->get_plugin_manager = anjuta_app_get_plugin_manager;
 	iface->get_profile_manager = anjuta_app_get_profile_manager;
+	iface->saving_push = anjuta_app_saving_push;
+	iface->saving_pop = anjuta_app_saving_pop;
 }
 
 ANJUTA_TYPE_BEGIN(AnjutaApp, anjuta_app, GTK_TYPE_WINDOW);
diff -urNp anjuta-2.24.2.orig/src/anjuta-app.h anjuta-2.24.2/src/anjuta-app.h
--- anjuta-2.24.2.orig/src/anjuta-app.h	2009-03-16 01:11:44.000000000 +0530
+++ anjuta-2.24.2/src/anjuta-app.h	2009-03-16 02:28:29.000000000 +0530
@@ -58,6 +58,8 @@ struct _AnjutaApp
 	AnjutaPreferences *preferences;
 	AnjutaPluginManager *plugin_manager;
 	AnjutaProfileManager *profile_manager;
+
+	gint save_count;
 	
 	/* Bonobo */
 	GtkWidget *bonobo_dock;
diff -urNp anjuta-2.24.2.orig/src/anjuta.c anjuta-2.24.2/src/anjuta.c
--- anjuta-2.24.2.orig/src/anjuta.c	2009-03-16 01:11:44.000000000 +0530
+++ anjuta-2.24.2/src/anjuta.c	2009-03-16 02:28:29.000000000 +0530
@@ -80,6 +80,15 @@ on_anjuta_delete_event (AnjutaApp *app, 
 		}
 	}
 	
+	/* Wait for files to be really saved (asyncronous operation) */
+	if (app->save_count > 0)
+	{
+		g_message ("Waiting for %d file(s) to be saved!", app->save_count);
+		while (app->save_count > 0)
+		{
+			g_main_context_iteration (NULL, TRUE);
+		}
+	}
 	/* If current active profile is "user", save current session as
 	 * default session
 	 */


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-10/anjuta.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- anjuta.spec	21 Feb 2009 20:00:12 -0000	1.57
+++ anjuta.spec	16 Mar 2009 20:10:21 -0000	1.58
@@ -2,14 +2,24 @@
 Name:		anjuta
 Epoch:		1
 Version:	2.24.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/%{name}-%{version}.tar.gz
 
+# http://bugzilla.gnome.org/559951
+Patch0:		%{name}-%{version}-class-gen-add-class.patch
+# http://bugzilla.gnome.org/575147
+Patch1:		%{name}-%{version}-class-gen-templates.patch
+# http://bugzilla.gnome.org/560284
+Patch2:		%{name}-%{version}-delete-folder-crash.patch
+# http://bugzilla.gnome.org/563530
+Patch3:		%{name}-%{version}-hide-python-binaries.patch
+# http://bugzilla.gnome.org/574376
+Patch4:		%{name}-%{version}-save-and-exit.patch
 # http://bugzilla.gnome.org/560311
-Patch0:		%{name}-%{version}-webkit.patch
+Patch5:		%{name}-%{version}-webkit.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -88,6 +98,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # Suppress rpmlint error.
 chmod 644 `find . -name "*.cxx" -perm /111 -print`
@@ -119,6 +134,20 @@
 
 make %{?_smp_mflags}
 
+# Strip unneeded translations from .mo files:
+# http://bugzilla.gnome.org/474987
+pushd ./po
+  grep --invert-match \
+    ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" \
+    POTFILES.in > POTFILES.keep
+  mv POTFILES.keep POTFILES.in
+  intltool-update --pot
+  for p in *.po; do
+    msgmerge $p %{name}.pot > $p.out
+    msgfmt -o `basename $p .po`.gmo $p.out
+  done
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -277,6 +306,18 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sun Mar 16 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-2
+- Stripped redundant translations from .mo files. (GNOME Bugzilla #474987)
+- Backported fix to enable addition of new classes to a project using the
+  class generator plugin. (GNOME Bugzilla #559951)
+- Backported fix to prevent a crash when a folder within a project is deleted
+  from a different application. (GNOME Bugzilla #560284)
+- Backported fix to hide .pyc and .pyo files. (GNOME Bugzilla #563530)
+- Backported fix to actually save files, modified by the GtkSourceview editor
+  plugin, on exit from 2.25.x. (GNOME Bugzilla #574376)
+- Added patch against class generator plugin to fix wrong copyright and license
+  notices. (GNOME Bugzilla #575147)
+
 * Sun Jan 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-1
 - Version bump to 2.24.2. (Red Hat Bugzilla #478684)
   * Debug manager plugin:

More information about the fedora-extras-commits mailing list