← Back to branch summary

~ubuntu-branches/ubuntu/maverick/liferea/maverick

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2008-12-17 20:43:04 UTC
  • mfrom: (1.2.54 upstream)
  • Revision ID: james.westby@ubuntu.com-20081217204304-7p9cbrtiqtlryz60
Tags: 1.4.23-0ubuntu1
https://launchpad.net/bugs/309108
https://launchpad.net/bugs/291185
* New upstream bugfix release (lp: #309108).
  - Fixes a cache limit bug when merging items of feeds with
    more items than the cache allows (lp: #291185).
* debian/patches/series:
  - don't apply lua5.1.pc, we use lua5.0.
* debian/patches/fix_toggle_status_menu:
  - Removed, applied upstream.
* debian/patches/fix_launcher_script_calling_xul:
  - Removed, not needed anymore.
* debian/patches/01_ubuntu_feedlists,
  debian/patches/hildon_frothing:
  - Updated to apply again.
* debian/patches/xulrunner-1.9:
  - Updated for the new code.
* debian/patches/90_autoreconf:
  - New patch, generated by running autoreconf -fiv
* debian/patches/99_autoconf:
  - Removed, obsoleted by 90_autoreconf.
* debian/rules:
  - Don't disable gecko; enable it and check for libxul-embedding to build
    the Xulrunner engine. Don't enable xulrunner anymore, as it's now done
    via --enable-gecko.
* debian/patches/load_proper_xulrunner:
  - Patch from Fabien Tassin to load the appropriate Xulrunner version.
    This is a replacement for fix_launcher_script_calling_xul patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
57
57
 
58
58
static BaconMessageConnection *bacon_connection = NULL;
59
59
 
60
 
gboolean lifereaStarted = FALSE;
 
60
static enum {
 
61
        STATE_STARTING,
 
62
        STATE_STARTED,
 
63
        STATE_SHUTDOWN
 
64
} runState = STATE_STARTING;
61
65
 
62
66
gboolean on_quit(GtkWidget *widget, GdkEvent *event, gpointer user_data);
63
67
 
286
290
           locking in Liferea because it freezes the program
287
291
           when running Flash applets in gtkmozembed */
288
292
 
289
 
        lifereaStarted = TRUE;
 
293
        runState = STATE_STARTING;
290
294
        
291
295
        debug_end_measurement (DEBUG_DB, "startup");
292
296
        
301
305
on_quit (GtkWidget *widget, GdkEvent *event, gpointer user_data)
302
306
{
303
307
        debug_enter ("on_quit");
 
308
        
 
309
        /* prevents signal handler from calling us a second time */
 
310
        if (runState == STATE_SHUTDOWN)
 
311
                return FALSE;
 
312
                
 
313
        runState = STATE_SHUTDOWN;
304
314
 
305
315
        /* order is important ! */
306
316