rpms/logjam/F-8 logjam-4.5.3-gtkspell.patch, 1.1, 1.2 logjam-4.5.3-no_quit_when_docked.patch, 1.1, 1.2 logjam-4.5.3-start_in_dock.patch, 1.1, 1.2 logjam.spec, 1.43, 1.44

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	logjam-4.5.3-gtkspell.patch 
	logjam-4.5.3-no_quit_when_docked.patch 
	logjam-4.5.3-start_in_dock.patch logjam.spec 
Log Message:
fix dock related behaviors, fix patch8 to apply with fuzz=0

logjam-4.5.3-gtkspell.patch:

Index: logjam-4.5.3-gtkspell.patch
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-gtkspell.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam-4.5.3-gtkspell.patch	6 Apr 2006 22:27:38 -0000	1.1
+++ logjam-4.5.3-gtkspell.patch	28 Jul 2008 18:11:35 -0000	1.2
@@ -1,7 +1,8 @@
---- logjam-4.5.3/src/jamview.c.orig  Sat Mar 25 16:56:46 2006
-+++ logjam-4.5.3/src/jamview.c       Sat Mar 25 16:55:06 2006
-@@ -816,26 +816,30 @@
-
+diff -up logjam-4.5.3/src/jamview.c.bz186906 logjam-4.5.3/src/jamview.c
+--- logjam-4.5.3/src/jamview.c.bz186906	2005-06-19 14:05:40.000000000 -0400
++++ logjam-4.5.3/src/jamview.c	2008-07-28 13:54:29.000000000 -0400
+@@ -816,27 +816,31 @@ jam_view_set_doc(JamView *view, JamDoc *
+ 
  void
  jam_view_settings_changed(JamView *view) {
 -#if 0
@@ -10,22 +11,22 @@
 -	if (conf.options.usespellcheck != hadspell) {
 -		GtkSpell *spell;
 -		if (conf.options.usespellcheck) {
-+       GtkSpell *spell;
-+       GError *err = NULL;
-+       spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry));
-+       if (conf.options.usespellcheck) {
-+               if (spell) {
-+                       if (!gtkspell_set_language(spell, conf.spell_language, &err)) {
-+                               jam_warning(NULL, // XXX GTK_WINDOW(view->jw),
-+                                               _("GtkSpell error: %s"), err->message);
-+                               g_error_free(err);
-+                       }
-+               } else {
++	GtkSpell *spell;
++	GError *err = NULL;
++	spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(view->entry));
++	if (conf.options.usespellcheck) {
++		if (spell) {
++			if (!gtkspell_set_language(spell, conf.spell_language, &err)) {
++				jam_warning(NULL, // XXX GTK_WINDOW(view->jw),
++						_("GtkSpell error: %s"), err->message);
++				g_error_free(err);
++			}
++		} else {
  			GError *err = NULL;
 -			if (gtkspell_new_attach(GTK_TEXT_VIEW(fetcheentry(jw)), conf.spell_language , &err) == NULL) {
 -				jam_warning(GTK_WINDOW(jw),
-+                       if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) {
-+                               jam_warning(NULL,
++			if (gtkspell_new_attach(GTK_TEXT_VIEW(view->entry), conf.spell_language , &err) == NULL) {
++				jam_warning(NULL,
  						_("GtkSpell error: %s"), err->message);
  				conf.options.usespellcheck = FALSE;
  				g_error_free(err);
@@ -35,11 +36,12 @@
 -			if (spell)
 -				gtkspell_detach(spell);
  		}
-+       } else {
-+               if (spell)
-+                       gtkspell_detach(spell);
++	} else {
++		if (spell)
++			gtkspell_detach(spell);
  	}
--#endif
  #endif
-        if (conf.uifont)
-                jam_widget_set_font(view->entry, conf.uifont);
+-#endif
+ 	if (conf.uifont)
+ 		jam_widget_set_font(view->entry, conf.uifont);
+ 

logjam-4.5.3-no_quit_when_docked.patch:

Index: logjam-4.5.3-no_quit_when_docked.patch
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-no_quit_when_docked.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam-4.5.3-no_quit_when_docked.patch	2 Jul 2008 21:16:57 -0000	1.1
+++ logjam-4.5.3-no_quit_when_docked.patch	28 Jul 2008 18:11:35 -0000	1.2
@@ -1,15 +1,15 @@
-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) {
+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-07-28 13:55:37.000000000 -0400
++++ logjam-4.5.3/src/jam.c	2008-07-28 14:00:57.000000000 -0400
+@@ -757,6 +757,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);
++	if (app.docklet)
++		gtk_widget_hide(GTK_WIDGET(jw));
++	else
 +#endif
+ 	jam_quit(jw);
  	return TRUE; /* don't ever let this delete the window; quit will do it. */
  }
- 

logjam-4.5.3-start_in_dock.patch:

Index: logjam-4.5.3-start_in_dock.patch
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-8/logjam-4.5.3-start_in_dock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam-4.5.3-start_in_dock.patch	13 May 2008 14:55:43 -0000	1.1
+++ logjam-4.5.3-start_in_dock.patch	28 Jul 2008 18:11:35 -0000	1.2
@@ -22,16 +22,29 @@
 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) {
+@@ -832,8 +845,6 @@
  	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())
+ 		gtk_main_iteration();
+@@ -853,7 +864,13 @@
+ #ifdef USE_DOCK
+ 	if (conf.options.docklet)
+ 		docklet_setup(GTK_WINDOW(jw));
++
++	if (app.docklet) {
++		if (!conf.options.start_in_dock)
++			gtk_widget_show(GTK_WIDGET(jw));
++	} else
+ #endif
++	gtk_widget_show(GTK_WIDGET(jw));
+ 
+ 	draftentry = jam_load_autosave(jw);
+ 	if (draftentry) {
 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
@@ -55,14 +68,11 @@
  #endif
  
  #ifndef G_OS_WIN32
-@@ -460,6 +462,10 @@ uisettings(JamWin *jw) {
+@@ -460,6 +468,7 @@ 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);
++	groupedbox_pack(GROUPEDBOX(misc), sw_make("ui_start_in_dock"), FALSE);
  #endif /* USE_DOCK */
  
  	return vbox;


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-8/logjam.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- logjam.spec	2 Jul 2008 21:43:57 -0000	1.43
+++ logjam.spec	28 Jul 2008 18:11:35 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	24%{?dist}.1
+Release:	25%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -119,6 +119,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-25
+- fix docked behavior again (bz 447146)
+- fix config option to start in dock again (bz 445998)
+- fix patch8 to apply with fuzz=0
+
 * Wed Jul  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-24.1
 - don't try to include non-existant patches