rpms/logjam/devel logjam-4.5.3-close_when_send.patch, NONE, 1.1 logjam-4.5.3-imageresize.patch, NONE, 1.1 logjam-4.5.3-no_quit_when_docked.patch, NONE, 1.1 logjam-4.5.3-uk.po.patch, NONE, 1.1 logjam.spec, 1.45, 1.46

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20681/devel

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-close_when_send.patch 
	logjam-4.5.3-imageresize.patch 
	logjam-4.5.3-no_quit_when_docked.patch 
	logjam-4.5.3-uk.po.patch 
Log Message:

Fix the image resize bug, apply all of Andy Shevchenko's enhancements.


logjam-4.5.3-close_when_send.patch:

--- NEW FILE logjam-4.5.3-close_when_send.patch ---
diff -up logjam-4.5.3/src/jam.c.close-when-send logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/jam.c	2008-05-18 10:31:30.000000000 +0300
@@ -363,6 +363,10 @@ action_cb(GtkWidget *w, JamWin *jw) {
 	} else {
 		g_warning("action callback, but no default action?\n");
 	}
+#ifdef USE_DOCK
+	if (conf.options.close_when_send && app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+#endif
 }
 
 static void
@@ -395,6 +399,10 @@ delete_cb(GtkWidget *w, JamWin *jw) {
 	} else {
 		delete_server_entry(jw);
 	}
+#ifdef USE_DOCK
+	if (conf.options.close_when_send && app.docklet)
+		gtk_widget_hide(GTK_WIDGET(jw));
+#endif
 }
 
 static void
diff -up logjam-4.5.3/src/conf_xml.c.close-when-send logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/conf_xml.c	2008-05-18 09:49:33.000000000 +0300
@@ -183,6 +183,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(autosave)
 		READOPTION(cfautostart)
 		READOPTION(cfusemask)
+		READOPTION(close_when_send)
 		READOPTION(docklet)
 		READOPTION(start_in_dock)
 		READOPTION(cffloat)
@@ -326,6 +327,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(autosave);
 	WRITEOPTION(cfautostart);
 	WRITEOPTION(cfusemask);
+	WRITEOPTION(close_when_send);
 	WRITEOPTION(docklet);
 	WRITEOPTION(start_in_dock);
 	WRITEOPTION(cffloatraise);
diff -up logjam-4.5.3/src/settings.c.close-when-send logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/settings.c	2008-05-18 09:56:35.000000000 +0300
@@ -85,6 +85,8 @@ static SettingsWidget settingswidgets[] 
 	{ "ui_font", &conf.uifont,
 		SW_CUSTOM, N_("Entry display font:") },
 #ifndef G_OS_WIN32
+	{ "ui_close_when_send", &conf.options.close_when_send,
+		SW_TOGGLE, N_("Close main window after sending") },
 	{ "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,
@@ -397,6 +399,10 @@ uisettings(JamWin *jw) {
 			G_CALLBACK(sec_changed_cb), sw);
 	groupedbox_pack(GROUPEDBOX(post), sw_make("ui_defaultsecurity"), FALSE);
 
+#ifdef USE_DOCK
+	groupedbox_pack(GROUPEDBOX(post), sw_make("ui_close_when_send"), FALSE);
+#endif /* USE_DOCK */
+
 	entry = groupedbox_new_with_text(_("Entries"));
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
 
diff -up logjam-4.5.3/src/conf.h.close-when-send logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.close-when-send	2008-05-18 09:12:19.000000000 +0300
+++ logjam-4.5.3/src/conf.h	2008-05-18 09:52:36.000000000 +0300
@@ -51,6 +51,7 @@ typedef struct {
 	gboolean autosave;
 	gboolean cfautostart;
 	gboolean cfusemask;
+	gboolean close_when_send;
 	gboolean docklet;
 	gboolean cffloat;
 	gboolean cffloatraise;

logjam-4.5.3-imageresize.patch:

--- NEW FILE logjam-4.5.3-imageresize.patch ---
diff -up logjam-4.5.3/src/network-soup.c.BAD logjam-4.5.3/src/network-soup.c
--- logjam-4.5.3/src/network-soup.c.BAD	2008-07-02 17:02:45.000000000 -0400
+++ logjam-4.5.3/src/network-soup.c	2008-07-02 17:03:04.000000000 -0400
@@ -75,7 +75,7 @@ net_post_blocking(const char *url, GSLis
 		*colonpos = ':';
 	}
 	soup_message_set_request(req, "application/x-www-form-urlencoded",
-			SOUP_MEMORY_TEMPORARY, post->str, post->len);
+			SOUP_MEMORY_TEMPORARY, post? post->str : NULL, post? post->len : 0);
 
 	status = soup_session_send_message(session, req);
 	if (status != SOUP_STATUS_OK) {

logjam-4.5.3-no_quit_when_docked.patch:

--- NEW FILE logjam-4.5.3-no_quit_when_docked.patch ---
diff -up logjam-4.5.3/src/jam.c.no-quit-when-docked logjam-4.5.3/src/jam.c
--- logjam-4.5.3/src/jam.c.no-quit-when-docked	2008-05-18 10:31:30.000000000 +0300
+++ logjam-4.5.3/src/jam.c	2008-05-18 10:48:33.000000000 +0300
@@ -765,7 +765,11 @@ jam_quit(JamWin *jw) {
 
 static gboolean
 delete_event_cb(JamWin *jw) {
+#ifdef USE_DOCK
+	gtk_widget_hide(GTK_WIDGET(jw));
+#else
 	jam_quit(jw);
+#endif
 	return TRUE; /* don't ever let this delete the window; quit will do it. */
 }
 

logjam-4.5.3-uk.po.patch:

--- NEW FILE logjam-4.5.3-uk.po.patch ---
diff -up logjam-4.5.3/po/uk_UA.po.orig logjam-4.5.3/po/uk_UA.po
--- logjam-4.5.3/po/uk_UA.po.orig	2005-08-25 05:42:14.000000000 +0300
+++ logjam-4.5.3/po/uk_UA.po	2008-05-18 10:53:43.000000000 +0300
@@ -662,7 +662,7 @@ msgstr "/С_ервіс"
 
 #: ../src/friends.c:252
 msgid "/Tools/Hide _Statistics"
-msgstr "/Сервіс/Показати _статистику"
+msgstr "/Сервіс/Сховати _статистику"
 
 #: ../src/friends.c:253
 msgid "/Tools/Export..."


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- logjam.spec	13 May 2008 14:56:07 -0000	1.45
+++ logjam.spec	2 Jul 2008 21:17:38 -0000	1.46
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	23%{?dist}
+Release:	24%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -34,6 +34,10 @@
 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
+Patch17:	logjam-4.5.3-uk.po.patch
+Patch18:	logjam-4.5.3-no_quit_when_docked.patch
+Patch19:	logjam-4.5.3-close_when_send.patch
+Patch20:	logjam-4.5.3-imageresize.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -67,6 +71,10 @@
 %patch14 -p1 -b .tags
 %patch15 -p1 -b .default-spelllang-en-US
 %patch16 -p1 -b .start-in-dock
+%patch17 -p1 -b .uk.po
+%patch18 -p1 -b .no_quit_when_docked
+%patch19 -p1 -b .close_when_send
+%patch20 -p1 -b .imageresize
 
 %build
 touch NEWS README AUTHORS
@@ -111,6 +119,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jul  1 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-24
+- fix ukranian translation (bz 447145)
+- fix docked behavior (bz 447146)
+- add close when send option (bz 447147)
+- fix image resize sigsegv (bz 452170)
+
 * 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)