On Wed, 15 Sep 2010 21:34:52 +0200 Jiří Techet techet@gmail.com wrote:
Thanks, I'd like to commit this now. I realize it's been a while, but the patch doesn't apply cleanly and I can't see any commits since that would have caused conflicts. Any chance you could update and resubmit please?
Hi Nick,
no problem, I have just rebased all my patches on top of mainline. This particular patch is attached.
Thanks, but still no joy. The problem is these 2 hunks:
@@ -599,7 +599,7 @@ static void on_document_close(GObject *obj, GeanyDocument *doc) { GeanyDocument *last_doc;
last_doc = g_queue_peek_head(mru_docs);
last_doc = g_queue_peek_nth(mru_docs, 1);if (DOC_VALID(last_doc) && document_get_current() == doc) {
@@ -607,8 +607,10 @@ static void on_document_close(GObject *obj, GeanyDocument *doc) document_get_notebook_page(last_doc)); } g_queue_remove(mru_docs, doc);
g_idle_add(on_idle_close, NULL);
/* this prevents the pop up window from showing when there's a single* document */if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 2)g_queue_clear(mru_docs);}
I haven't been able to work out where they apply to. It didn't seem that a conflict had been introduced since your first patch for this code, but maybe I'm missing something.
You can find the remaining pending patches under for_review3 branch here:
http://gitorious.org/~techy/geany/gproject-geany
If you wish me to resubmit them by email, just tell me - I would
Thanks - no need to resend. I can download the patches.
really like to see the patches extending geany's API to be a part of mainline so my gproject plugin would not depend on patched geany and could be moved among other plugins repository.
I've applied some this afternoon, will get through them soon hopefully.
Regards, Nick