rpms/logjam/F-7 logjam-4.5.3-start_in_dock.patch, NONE, 1.1 logjam.spec, 1.40, 1.41

Tom Callaway (spot) fedora-extras-commits at redhat.com
Tue May 13 14:56:43 UTC 2008


Author: spot

Update of /cvs/extras/rpms/logjam/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19458/F-7

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-start_in_dock.patch 
Log Message:
add without-xmms conditional, enable start in dock config option

logjam-4.5.3-start_in_dock.patch:

--- NEW FILE logjam-4.5.3-start_in_dock.patch ---
Allow start logjam in system tray (no main window at start).

diff -up logjam-4.5.3/src/conf_xml.c.orig logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.orig	2008-05-11 14:35:48.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2008-05-11 14:55:24.000000000 +0300
@@ -184,6 +184,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
 		READOPTION(docklet)
+		READOPTION(start_in_dock)
 		READOPTION(cffloat)
 		READOPTION(cffloatraise)
 		READOPTION(friends_hidestats)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
 	WRITEOPTION(docklet);
+	WRITEOPTION(start_in_dock);
 	WRITEOPTION(cffloatraise);
 	WRITEOPTION(cffloat);
 	WRITEOPTION(friends_hidestats);
diff -up logjam-4.5.3/src/jam.c.orig logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.orig	2005-09-10 04:45:01.000000000 +0300
+++ logjam-4.5.3/src/jam.c	2008-05-11 14:56:59.000000000 +0300
@@ -832,7 +832,8 @@ jam_run(JamDoc *doc) {
 	gtk_widget_show(vbox);
 	jam_update_actions(jw);
 
-	gtk_widget_show(GTK_WIDGET(jw));
+	if (!conf.options.start_in_dock)
+		gtk_widget_show(GTK_WIDGET(jw));
 
 	/* suck a bunch of events in. */
 	while (gtk_events_pending())
diff -up logjam-4.5.3/src/conf.h.orig logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.orig	2005-02-21 19:46:10.000000000 +0200
+++ logjam-4.5.3/src/conf.h	2008-05-11 14:54:16.000000000 +0300
@@ -59,6 +59,7 @@ typedef struct {
 	gboolean allowmultipleinstances;
 	gboolean smartquotes;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
+	gboolean start_in_dock;
 #endif /* HAVE_GTK */
 } Options;
 
diff -up logjam-4.5.3/src/settings.c.orig logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.orig	2005-02-21 20:31:21.000000000 +0200
+++ logjam-4.5.3/src/settings.c	2008-05-11 14:59:13.000000000 +0300
@@ -87,6 +87,8 @@ static SettingsWidget settingswidgets[] 
 #ifndef G_OS_WIN32
 	{ "ui_docklet", &conf.options.docklet,
 		SW_TOGGLE, N_("Add icon to system _tray (for GNOME/KDE/etc. dock)") },
+	{ "ui_start_in_dock", &conf.options.start_in_dock,
+		SW_TOGGLE, N_("Start in system tray") },
 #endif
 
 #ifndef G_OS_WIN32
@@ -460,6 +462,10 @@ uisettings(JamWin *jw) {
 	g_signal_connect(G_OBJECT(button), "toggled",
 			G_CALLBACK(docklet_change_cb), jw);
 	groupedbox_pack(GROUPEDBOX(misc), button, FALSE);
+	button = sw_make("ui_start_in_dock");
+	g_signal_connect(G_OBJECT(button), "toggled",
+			NULL, NULL);
+	groupedbox_pack(GROUPEDBOX(misc), button, FALSE);
 #endif /* USE_DOCK */
 
 	return vbox;


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- logjam.spec	18 Mar 2008 21:46:07 -0000	1.40
+++ logjam.spec	13 May 2008 14:55:14 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	22%{?dist}
+Release:	23%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -32,6 +32,7 @@
 Patch13:	logjam-title.patch
 Patch14:	logjam-4.5.3-tags.patch
 Patch15:	logjam-4.5.3-default-spelllang-en-US.patch
+Patch16:	logjam-4.5.3-start_in_dock.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -63,6 +64,7 @@
 %patch13 -p1 -b .title
 %patch14 -p1 -b .tags
 %patch15 -p1 -b .default-spelllang-en-US
+%patch16 -p1 -b .start-in-dock
 
 %build
 touch NEWS README AUTHORS
@@ -72,6 +74,8 @@
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
+%else
+	--without-xmms
 %endif
 make
 
@@ -105,6 +109,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue May 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-23
+- add explicit without-xmms conditional (bz 445996)
+- add configuration option to start in dock (bz 445998)
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-22
 - re-enable threading where we really need it only
 




More information about the fedora-extras-commits mailing list