View | Details | Raw Unified | Return to issue 108846
Collapse All | Expand All

(-)a/desktop/source/app/cmdlineargs.cxx (-1 / +1 lines)
Lines 387-393 Link Here
387
	}
387
	}
388
	else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
388
	else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
389
	{
389
	{
390
#if defined(WNT) || defined(OS2) || defined(QUARTZ)
390
#if defined(ENABLE_QUICKSTART_APPLET)
391
		SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
391
		SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
392
#endif
392
#endif
393
		return sal_True;
393
		return sal_True;
(-)a/desktop/source/app/makefile.mk (+4 lines)
Lines 44-49 Link Here
44
CFLAGS+=-DGNOME_VFS_ENABLED
44
CFLAGS+=-DGNOME_VFS_ENABLED
45
.ENDIF
45
.ENDIF
46
46
47
.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
48
CFLAGS+=-DENABLE_QUICKSTART_APPLET
49
.ENDIF
50
47
SHL1TARGET = sofficeapp
51
SHL1TARGET = sofficeapp
48
SHL1OBJS = \
52
SHL1OBJS = \
49
    $(SLO)$/app.obj \
53
    $(SLO)$/app.obj \
(-)a/sfx2/source/appl/shutdownicon.cxx (-1 / +1 lines)
Lines 555-562 Link Here
555
        return;
555
        return;
556
        
556
        
557
    // always remove ourselves as listener
557
    // always remove ourselves as listener
558
    pInst->m_bListenForTermination = true;
558
    xDesktop->removeTerminateListener( pInst );
559
    xDesktop->removeTerminateListener( pInst );
559
    pInst->m_bListenForTermination = true;
560
560
561
    // terminate desktop only if no tasks exist
561
    // terminate desktop only if no tasks exist
562
    Reference< XFramesSupplier > xSupplier( xDesktop, UNO_QUERY );
562
    Reference< XFramesSupplier > xSupplier( xDesktop, UNO_QUERY );
(-)a/sfx2/source/appl/shutdowniconunx.cxx (-2 / +7 lines)
Lines 39-44 Link Here
39
static EggTrayIcon *pTrayIcon;
39
static EggTrayIcon *pTrayIcon;
40
static GtkWidget *pExitMenuItem = NULL;
40
static GtkWidget *pExitMenuItem = NULL;
41
static GtkWidget *pOpenMenuItem = NULL;
41
static GtkWidget *pOpenMenuItem = NULL;
42
static GtkWidget *pDisableMenuItem = NULL;
42
43
43
static void open_url_cb( GtkWidget *, gpointer data )
44
static void open_url_cb( GtkWidget *, gpointer data )
44
{
45
{
Lines 67-74 Link Here
67
static void exit_quickstarter_cb( GtkWidget * )
68
static void exit_quickstarter_cb( GtkWidget * )
68
{
69
{
69
	egg_tray_icon_cancel_message (pTrayIcon, 1 );
70
	egg_tray_icon_cancel_message (pTrayIcon, 1 );
70
	ShutdownIcon::getInstance()->terminateDesktop();
71
	plugin_shutdown_sys_tray();
71
	plugin_shutdown_sys_tray();
72
	//terminate may cause this .so to be unloaded. So we must be hands off
73
	//all calls into this .so after this call
74
	ShutdownIcon::terminateDesktop();
72
}
75
}
73
76
74
static void menu_deactivate_cb( GtkWidget *pMenu )
77
static void menu_deactivate_cb( GtkWidget *pMenu )
Lines 265-271 Link Here
265
	pMenuItem = gtk_separator_menu_item_new();
268
	pMenuItem = gtk_separator_menu_item_new();
266
	gtk_menu_shell_append( pMenuShell, pMenuItem );
269
	gtk_menu_shell_append( pMenuShell, pMenuItem );
267
270
268
	(void) add_image_menu_item
271
	pDisableMenuItem = add_image_menu_item
269
        ( pMenuShell, GTK_STOCK_CLOSE,
272
        ( pMenuShell, GTK_STOCK_CLOSE,
270
		  pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH_UNX ),
273
		  pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH_UNX ),
271
		  G_CALLBACK( systray_disable_cb ) );
274
		  G_CALLBACK( systray_disable_cb ) );
Lines 289-294 Link Here
289
	bool bModal = ShutdownIcon::bModalMode;
292
	bool bModal = ShutdownIcon::bModalMode;
290
	gtk_widget_set_sensitive( pExitMenuItem, !bModal);
293
	gtk_widget_set_sensitive( pExitMenuItem, !bModal);
291
	gtk_widget_set_sensitive( pOpenMenuItem, !bModal);
294
	gtk_widget_set_sensitive( pOpenMenuItem, !bModal);
295
	gtk_widget_set_sensitive( pDisableMenuItem, !bModal);
292
}
296
}
293
297
294
extern "C" {
298
extern "C" {
Lines 404-409 Link Here
404
	pTrayIcon = NULL;
409
	pTrayIcon = NULL;
405
	pExitMenuItem = NULL;
410
	pExitMenuItem = NULL;
406
	pOpenMenuItem = NULL;
411
	pOpenMenuItem = NULL;
412
	pDisableMenuItem = NULL;
407
}
413
}
408
414
409
#endif // ENABLE_QUICKSTART_APPLET
415
#endif // ENABLE_QUICKSTART_APPLET

Return to issue 108846