View | Details | Raw Unified | Return to bug 15658
Collapse All | Expand All

(-)logjam-4.5.3/src/conf_xml.c.orig (+2 lines)
Lines 184-189 parseoptions(Configuration *c, xmlDocPtr Link Here
184 
		READOPTION(cfautostart)
 184 
		READOPTION(cfautostart)
185 
		READOPTION(cfusemask)
 185 
		READOPTION(cfusemask)
186 
		READOPTION(docklet)
 186 
		READOPTION(docklet)
187 
		READOPTION(start_in_dock)
187 
		READOPTION(cffloat)
 188 
		READOPTION(cffloat)
188 
		READOPTION(cffloatraise)
 189 
		READOPTION(cffloatraise)
189 
		READOPTION(friends_hidestats)
 190 
		READOPTION(friends_hidestats)
Lines 326-331 writeoptions(Options *options, xmlNodePt Link Here
326 
	WRITEOPTION(cfautostart);
 327 
	WRITEOPTION(cfautostart);
327 
	WRITEOPTION(cfusemask);
 328 
	WRITEOPTION(cfusemask);
328 
	WRITEOPTION(docklet);
 329 
	WRITEOPTION(docklet);
330 
	WRITEOPTION(start_in_dock);
329 
	WRITEOPTION(cffloatraise);
 331 
	WRITEOPTION(cffloatraise);
330 
	WRITEOPTION(cffloat);
 332 
	WRITEOPTION(cffloat);
331 
	WRITEOPTION(friends_hidestats);
 333 
	WRITEOPTION(friends_hidestats);
(-)logjam-4.5.3/src/jam.c.orig (-2 / +6 lines)
Lines 832-839 Link Here
832 
	gtk_widget_show(vbox);
 845 
	gtk_widget_show(vbox);
833 
	jam_update_actions(jw);
 846 
	jam_update_actions(jw);
834 

          847
          

        

            

              835
              
	gtk_widget_show(GTK_WIDGET(jw));

              
              
            

            

              836
              

            

        

          837
          
	/* suck a bunch of events in. */

          848
          
	/* suck a bunch of events in. */

        

        

          838
          
	while (gtk_events_pending())

          849
          
	while (gtk_events_pending())

        

        

          839
          
		gtk_main_iteration();

          850
          
		gtk_main_iteration();

        

  

    
      
            Lines 853-859
          
      
      
        Link Here
      
    
  

        

          853
          
#ifdef USE_DOCK

          864
          
#ifdef USE_DOCK

        

        

          854
          
	if (conf.options.docklet)

          865
          
	if (conf.options.docklet)

        

        

          855
          
		docklet_setup(GTK_WINDOW(jw));

          866
          
		docklet_setup(GTK_WINDOW(jw));

        

            

              
              
              867
              

            

            

              868
              
	if (app.docklet) {

            

            

              869
              
		if (!conf.options.start_in_dock)

            

            

              870
              
			gtk_widget_show(GTK_WIDGET(jw));

            

            

              871
              
	} else

            

        

          856
          
#endif

          872
          
#endif

        

            

              
              
              873
              
	gtk_widget_show(GTK_WIDGET(jw));

            

        

          857
          

          874
          

        

        

          858
          
	draftentry = jam_load_autosave(jw);

          875
          
	draftentry = jam_load_autosave(jw);

        

        

          859
          
	if (draftentry) {

          876
          
	if (draftentry) {

        



(-)logjam-4.5.3/src/conf.h.orig
      (+1 lines)




  

    
      
            Lines 59-64
          typedef struct {
      
      
        Link Here
      
    
  

        

          59
          
	gboolean allowmultipleinstances;

          59
          
	gboolean allowmultipleinstances;

        

        

          60
          
	gboolean smartquotes;

          60
          
	gboolean smartquotes;

        

        

          61
          
	gboolean showmeta[JAM_VIEW_META_COUNT];

          61
          
	gboolean showmeta[JAM_VIEW_META_COUNT];

        

            

              
              
              62
              
	gboolean start_in_dock;

            

        

          62
          
#endif /* HAVE_GTK */

          63
          
#endif /* HAVE_GTK */

        

        

          63
          
} Options;

          64
          
} Options;

        

        

          64
          

          65
          

        



(-)logjam-4.5.3/src/settings.c.orig
      (+3 lines)




  

    
      
            Lines 87-92
          static SettingsWidget settingswidgets[] 
      
      
        Link Here
      
    
  

        

          87
          
#ifndef G_OS_WIN32

          87
          
#ifndef G_OS_WIN32

        

        

          88
          
	{ "ui_docklet", &conf.options.docklet,

          88
          
	{ "ui_docklet", &conf.options.docklet,

        

        

          89
          
		SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") },

          89
          
		SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") },

        

            

              
              
              90
              
	{ "ui_start_in_dock", &conf.options.start_in_dock,

            

            

              91
              
		SW_TOGGLE, N_("Start in system tray") },

            

        

          90
          
#endif

          92
          
#endif

        

        

          91
          

          93
          

        

        

          92
          
#ifndef G_OS_WIN32

          94
          
#ifndef G_OS_WIN32

        

  

    
      
            Lines 460-465
          uisettings(JamWin *jw) {
      
      
        Link Here
      
    
  

        

          460
          
	g_signal_connect(G_OBJECT(button), "toggled",

          468
          
	g_signal_connect(G_OBJECT(button), "toggled",

        

        

          461
          
			G_CALLBACK(docklet_change_cb), jw);

          469
          
			G_CALLBACK(docklet_change_cb), jw);

        

        

          462
          
	groupedbox_pack(GROUPEDBOX(misc), button, FALSE);

          470
          
	groupedbox_pack(GROUPEDBOX(misc), button, FALSE);

        

            

              
              
              471
              
	groupedbox_pack(GROUPEDBOX(misc), sw_make("ui_start_in_dock"), FALSE);

            

        

          463
          
#endif /* USE_DOCK */

          472
          
#endif /* USE_DOCK */

        

        

          464
          

          473
          

        

        

          465
          
	return vbox;

          474
          
	return vbox;

        






  

  Return to bug 15658