|
|
Author: rstrode
Update of /cvs/dist/rpms/xscreensaver/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5729
Modified Files:
xscreensaver-4.22-warn-about-extras.patch xscreensaver.spec
Log Message:
- Fix warn about extras patch
xscreensaver-4.22-warn-about-extras.patch:
demo-Gtk.c | 24 ++++++++++++++++++------
xscreensaver-demo.glade2 | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 6 deletions(-)
Index: xscreensaver-4.22-warn-about-extras.patch
===================================================================
RCS file:
/cvs/dist/rpms/xscreensaver/FC-4/xscreensaver-4.22-warn-about-extras.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-4.22-warn-about-extras.patch 12 Aug 2005 02:21:54 -0000
1.1
+++ xscreensaver-4.22-warn-about-extras.patch 12 Aug 2005 13:44:53 -0000
1.2
@@ -1,5 +1,5 @@
--- xscreensaver-4.22/driver/demo-Gtk.c.warn-about-extras 2005-03-20
18:20:32.000000000 -0500
-+++ xscreensaver-4.22/driver/demo-Gtk.c 2005-08-11 22:05:34.000000000
-0400
++++ xscreensaver-4.22/driver/demo-Gtk.c 2005-08-12 09:40:24.000000000
-0400
@@ -190,6 +190,7 @@
int *list_elt_to_hack_number; /* table for sorting the hack list */
int *hack_number_to_list_elt; /* the inverse table */
@@ -8,6 +8,18 @@
int list_count; /* how many items are in the list: this may be
less than p->screenhacks_count, if some are
suppressed. */
+@@ -1080,9 +1081,9 @@
+ #ifdef HAVE_GTK2
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
+ STFU g_assert (model);
+- gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
+- gtk_tree_selection_select_iter (selection, &iter);
++ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
++ gtk_tree_selection_select_iter (selection, &iter);
+ #else /* !HAVE_GTK2 */
+ gtk_list_select_item (GTK_LIST (list), list_elt);
+ #endif /* !HAVE_GTK2 */
@@ -3315,13 +3316,16 @@
calloc (sizeof(int), p->screenhacks_count + 1);
s->hacks_available_p = (Bool *)
@@ -26,24 +38,35 @@
}
/* Initialize list->hack table to unsorted mapping, omitting nonexistent
-@@ -3473,11 +3477,14 @@
+@@ -3470,15 +3474,23 @@
+ int hack_number = (list_elt >= 0
+ ? s->list_elt_to_hack_number[list_elt]
+ : -1);
++ Bool nothing_p = (s->total_available < 5);
Bool available_p = (hack_number >= 0
? s->hacks_available_p [hack_number]
: True);
-+ Bool nothing_p = (s->total_available < 5);
++
++ if (s->total_available == 0)
++ {
++ s->running_preview_error_p = True;
++ available_p = False;
++ }
+
#ifdef HAVE_GTK2
GtkWidget *notebook = name_to_widget (s, "preview_notebook");
gtk_notebook_set_page (GTK_NOTEBOOK (notebook),
- (s->running_preview_error_p
+- (s->running_preview_error_p
- ? (available_p ? 1 : 2)
-+ ? (available_p ? 1 :
-+ nothing_p ? 3 : 2)
- : 0));
+- : 0));
++ (s->running_preview_error_p
++ ? (available_p ? 1 : 2)
++ : 0));
#else /* !HAVE_GTK2 */
if (s->running_preview_error_p)
+ {
--- xscreensaver-4.22/driver/xscreensaver-demo.glade2.warn-about-extras
2005-03-21 20:22:08.000000000 -0500
-+++ xscreensaver-4.22/driver/xscreensaver-demo.glade2 2005-08-11
21:58:29.000000000 -0400
++++ xscreensaver-4.22/driver/xscreensaver-demo.glade2 2005-08-12
00:31:11.000000000 -0400
@@ -814,6 +814,49 @@
<property name="type">tab</property>
</packing>
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/FC-4/xscreensaver.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xscreensaver.spec 12 Aug 2005 02:21:54 -0000 1.51
+++ xscreensaver.spec 12 Aug 2005 13:44:53 -0000 1.52
@@ -4,7 +4,7 @@
Summary: X screen saver and locker
Name: %{name}
Version: %{version}
-Release: 6.fc4
+Release: 6.fc4.1
Epoch: 1
License: BSD
Group: Amusements/Graphics
@@ -206,6 +206,9 @@
%defattr(-,root,root)
%changelog
+* Fri Aug 12 2005 Ray Strode <rstrode@xxxxxxxxxx> 1:4.22-6.fc4.1
+- Fix warn about extras patch
+
* Thu Aug 11 2005 Ray Strode <rstrode@xxxxxxxxxx> 1:4.22-6.fc4
- update to xscreensaver 4.22
- tell users why they dont' have screensavers if they dont' have
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|