rpms/gnome-games/devel mines-cosmetics.patch, NONE, 1.1 mines-fixes.patch, NONE, 1.1 mines-keys-fix.patch, NONE, 1.1 mines-redraw-fix.patch, NONE, 1.1 mines-sensitive-fix.patch, NONE, 1.1 mines-visible-fix.patch, NONE, 1.1 gnome-games.spec, 1.227, 1.228
Matthias Clasen
mclasen at fedoraproject.org
Sun Aug 23 06:02:15 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4008
Modified Files:
gnome-games.spec
Added Files:
mines-cosmetics.patch mines-fixes.patch mines-keys-fix.patch
mines-redraw-fix.patch mines-sensitive-fix.patch
mines-visible-fix.patch
Log Message:
fix various issues in Mines
mines-cosmetics.patch:
gnomine.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE mines-cosmetics.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c 2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c 2009-08-23 01:42:41.527430702 -0400
@@ -865,7 +870,10 @@
" </menu>"
" <menu action='HelpMenu'>"
" <menuitem action='Contents'/>"
- " <menuitem action='About'/>" " </menu>" " </menubar>" "</ui>";
+ " <menuitem action='About'/>"
+ " </menu>"
+ " </menubar>"
+ "</ui>";
static GtkUIManager *
create_ui_manager (const gchar * group)
mines-fixes.patch:
gnomine.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
--- NEW FILE mines-fixes.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c 2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c 2009-08-23 01:42:41.527430702 -0400
@@ -290,7 +290,9 @@
set_flabel (GTK_MINEFIELD (mfield));
gtk_action_set_visible (pause_action, TRUE);
+ gtk_action_set_sensitive (pause_action, TRUE);
gtk_action_set_visible (resume_action, FALSE);
+ gtk_action_set_sensitive (resume_action, FALSE);
gtk_widget_hide (resume_container);
gtk_widget_show (mfield_container);
}
@@ -647,7 +649,7 @@
}
-static void
+static gboolean
pause_key_callback(GtkWidget *widget, GdkEventKey *event,
gpointer data )
{
@@ -658,8 +660,11 @@
resume_game_cb(NULL, NULL); // Resume the game
else
pause_callback(NULL, NULL, NULL); // Pause the game
+
+ return TRUE;
}
-
+
+ return FALSE;
}
@@ -865,7 +870,10 @@
" </menu>"
" <menu action='HelpMenu'>"
" <menuitem action='Contents'/>"
- " <menuitem action='About'/>" " </menu>" " </menubar>" "</ui>";
+ " <menuitem action='About'/>"
+ " </menu>"
+ " </menubar>"
+ "</ui>";
static GtkUIManager *
create_ui_manager (const gchar * group)
@@ -1067,12 +1075,6 @@
verify_ranges ();
- /* This is evil, but the normal button focus indicator
- * interferes with the face (but we still want the button
- * to be the default). */
- gtk_rc_parse_string
- ("style \"gnomine\" { GtkButton::interior-focus = 0 } class \"GtkButton\" style \"gnomine\"");
-
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), _(APP_NAME_LONG));
@@ -1081,7 +1083,6 @@
games_stock_init ();
gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-
g_signal_connect (G_OBJECT (window), "delete_event",
G_CALLBACK (quit_game), NULL);
g_signal_connect (G_OBJECT (window), "focus_out_event",
@@ -1094,6 +1095,7 @@
G_CALLBACK (pause_key_callback), NULL);
all_boxes = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (all_boxes);
gtk_container_add (GTK_CONTAINER (window), all_boxes);
@@ -1101,6 +1103,7 @@
accel_group = gtk_ui_manager_get_accel_group (ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
box = gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
+ gtk_widget_show (box);
gtk_box_pack_start (GTK_BOX (all_boxes), box, FALSE, FALSE, 0);
button_table = gtk_table_new (1, 3, FALSE);
@@ -1189,7 +1192,8 @@
new_game ();
- gtk_widget_show_all (window);
+ gtk_widget_show_all (button_table);
+ gtk_widget_show (window);
/* Must be after the window has been created. */
if (xpos >= 0 && ypos >= 0)
mines-keys-fix.patch:
gnomine.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE mines-keys-fix.patch ---
diff -up gnome-games-2.27.90/gnomine/gnomine.c.keys-fix gnome-games-2.27.90/gnomine/gnomine.c
--- gnome-games-2.27.90/gnomine/gnomine.c.keys-fix 2009-08-23 01:51:04.282681892 -0400
+++ gnome-games-2.27.90/gnomine/gnomine.c 2009-08-23 01:52:19.483680172 -0400
@@ -647,7 +647,7 @@ window_state_callback (GtkWidget * widge
}
-static void
+static gboolean
pause_key_callback(GtkWidget *widget, GdkEventKey *event,
gpointer data )
{
@@ -658,8 +658,11 @@ gpointer data )
resume_game_cb(NULL, NULL); // Resume the game
else
pause_callback(NULL, NULL, NULL); // Pause the game
+
+ return TRUE;
}
-
+
+ return FALSE;
}
mines-redraw-fix.patch:
gnomine.c | 6 ------
1 file changed, 6 deletions(-)
--- NEW FILE mines-redraw-fix.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c 2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c 2009-08-23 01:42:41.527430702 -0400
@@ -1067,12 +1075,6 @@
verify_ranges ();
- /* This is evil, but the normal button focus indicator
- * interferes with the face (but we still want the button
- * to be the default). */
- gtk_rc_parse_string
- ("style \"gnomine\" { GtkButton::interior-focus = 0 } class \"GtkButton\" style \"gnomine\"");
-
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), _(APP_NAME_LONG));
mines-sensitive-fix.patch:
gnomine.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE mines-sensitive-fix.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c 2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c 2009-08-23 01:42:41.527430702 -0400
@@ -290,7 +290,9 @@
set_flabel (GTK_MINEFIELD (mfield));
gtk_action_set_visible (pause_action, TRUE);
+ gtk_action_set_sensitive (pause_action, TRUE);
gtk_action_set_visible (resume_action, FALSE);
+ gtk_action_set_sensitive (resume_action, FALSE);
gtk_widget_hide (resume_container);
gtk_widget_show (mfield_container);
}
mines-visible-fix.patch:
gnomine.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE mines-visible-fix.patch ---
--- gnome-games-2.27.90/gnomine/gnomine.c 2009-08-12 14:59:04.000000000 -0400
+++ hacked/gnomine/gnomine.c 2009-08-23 01:42:41.527430702 -0400
@@ -1094,6 +1095,7 @@
G_CALLBACK (pause_key_callback), NULL);
all_boxes = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (all_boxes);
gtk_container_add (GTK_CONTAINER (window), all_boxes);
@@ -1101,6 +1103,7 @@
accel_group = gtk_ui_manager_get_accel_group (ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
box = gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
+ gtk_widget_show (box);
gtk_box_pack_start (GTK_BOX (all_boxes), box, FALSE, FALSE, 0);
button_table = gtk_table_new (1, 3, FALSE);
@@ -1189,7 +1192,8 @@
new_game ();
- gtk_widget_show_all (window);
+ gtk_widget_show_all (button_table);
+ gtk_widget_show (window);
/* Must be after the window has been created. */
if (xpos >= 0 && ypos >= 0)
Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- gnome-games.spec 14 Aug 2009 23:05:14 -0000 1.227
+++ gnome-games.spec 23 Aug 2009 06:02:13 -0000 1.228
@@ -46,7 +46,7 @@
Summary: Games for the GNOME desktop
Name: gnome-games
Version: 2.27.90
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: Amusements/Games
@@ -55,6 +55,17 @@ Source: http://download.gnome.org/source
Patch0: ggz-api-changes.patch
Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592774
+Patch2: mines-visible-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=574118
+Patch3: mines-redraw-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592775
+Patch4: mines-cosmetics.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592776
+Patch5: mines-keys-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592777
+Patch6: mines-sensitive-fix.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: gnome-games-devel
URL: http://projects.gnome.org/gnome-games/
@@ -133,6 +144,12 @@ This package contains user documentation
# rebrand gnometris as some think the name is to similar to a trademark
%patch1 -p1 -b .rebrand
+%patch2 -p1 -b .visible-fix
+%patch3 -p1 -b .redraw-fix
+%patch4 -p1 -b .cosmetics
+%patch5 -p1 -b .keys-fix
+%patch6 -p1 -b .sensitive-fix
+
sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
-e 's/GNOMEtris/GnomeFallingBlocks/g' \
po/*.po gnometris/help/*/*.po gnometris/help/C/gnometris.xml \
@@ -485,6 +502,9 @@ fi
%changelog
+* Sun Aug 23 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-2
+- Fix various issues in Mines
+
* Fri Aug 14 2009 Matthias Clasen <mclasen at redhat.com> 2.27.90-1
- Updated to 2.27.90
More information about the fedora-extras-commits
mailing list