Ubuntu
firefox package

  1. Bug #13214
  2. Comment #39

Comment 39 for bug 13214

Revision history for this message
In , Gavin Sharp (gavin-sharp) wrote :

Comment on attachment 300928
Patch 4

>Index: toolkit/xre/nsNativeAppSupportUnix.cpp

> gboolean save_yourself_cb(GnomeClient *client, gint phase,
> GnomeSaveStyle style, gboolean shutdown,
> GnomeInteractStyle interact, gboolean fast,
> gpointer user_data)
> {

>+ // Didn't save, or no way of saving. So signal for quit-application.
>+ if (!status && interact == GNOME_INTERACT_ANY) {
> gnome_client_request_interaction(client, GNOME_DIALOG_NORMAL,
> interact_cb, nsnull);
>+ return TRUE;
>+ }

This isn't equivalent to the code in attachment 300762, in the (!status && interact != GNOME_INTERACT_ANY) case (though not knowing the API I have no idea whether that case needs to be handled here). Don't you want to unconditionally return if !status, but check "interact" and optionally call gnome_client_request_interaction first?

>Index: toolkit/xre/nsAppRunner.cpp
>Index: toolkit/xre/nsAppRunner.h

I think you should have bsmedberg review these parts, at least. He's probably a better reviewer for the nsNativeAppSupportUnix changes too.