Hello community, here is the log from the commit of package gnome-mines for openSUSE:13.1 checked in at 2013-10-14 14:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/gnome-mines (Old) and /work/SRC/openSUSE:13.1/.gnome-mines.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-mines" Changes: -------- --- /work/SRC/openSUSE:13.1/gnome-mines/gnome-mines.changes 2013-09-27 17:25:37.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.gnome-mines.new/gnome-mines.changes 2013-10-14 14:27:28.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 13 11:09:31 UTC 2013 - dims...@opensuse.org + +- Update to version 3.10.1: + + Remove "Hint" action from app menu. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-mines-3.10.0.tar.xz New: ---- gnome-mines-3.10.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-mines.spec ++++++ --- /var/tmp/diff_new_pack.zUGt2J/_old 2013-10-14 14:27:29.000000000 +0200 +++ /var/tmp/diff_new_pack.zUGt2J/_new 2013-10-14 14:27:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnome-mines -Version: 3.10.0 +Version: 3.10.1 Release: 0 Summary: Minesweeper Game for GNOME License: GPL-2.0+ ++++++ gnome-mines-3.10.0.tar.xz -> gnome-mines-3.10.1.tar.xz ++++++ ++++ 5430 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/NEWS new/gnome-mines-3.10.1/NEWS --- old/gnome-mines-3.10.0/NEWS 2013-09-24 00:05:46.000000000 +0200 +++ new/gnome-mines-3.10.1/NEWS 2013-10-12 13:22:10.000000000 +0200 @@ -1,3 +1,9 @@ +GNOME Mines 3.10.1 +================== + +* Remove "Hint" action from app menu +* Translation updates + GNOME Mines 3.10.0 ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/configure.ac new/gnome-mines-3.10.1/configure.ac --- old/gnome-mines-3.10.0/configure.ac 2013-09-24 00:05:46.000000000 +0200 +++ new/gnome-mines-3.10.1/configure.ac 2013-10-12 13:22:10.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(gnome-mines, 3.10.0) +AC_INIT(gnome-mines, 3.10.1) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/po/c...@valencia.po new/gnome-mines-3.10.1/po/c...@valencia.po --- old/gnome-mines-3.10.0/po/c...@valencia.po 2013-09-24 00:05:46.000000000 +0200 +++ new/gnome-mines-3.10.1/po/c...@valencia.po 2013-10-12 13:18:06.000000000 +0200 @@ -6,7 +6,7 @@ # Xavier Conde Rueda <xavi.co...@gmail.com>, 2004. # Jesús Corrius <je...@softcatala.org>, 2005. # Josep Puigdemont i Casamajó <josep.puigdem...@gmail.com>, 2007. -# Gil Forcada <gilforc...@guifi.net>, 2008, 2010, 2011, 2012. +# Gil Forcada <gilforc...@guifi.net>, 2008, 2010, 2011, 2012, 2013. # Carles Ferrando <carles.ferra...@gmail.com>, 2010. # Jordi Serratosa <jor...@softcatala.cat>, 2012. # @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: gnome-games\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-12 23:45+0100\n" -"PO-Revision-Date: 2012-09-18 20:37+0200\n" +"POT-Creation-Date: 2013-10-06 22:10+0200\n" +"PO-Revision-Date: 2013-09-14 00:19+0200\n" "Last-Translator: Gil Forcada <gilforc...@guifi.net>\n" "Language-Team: Catalan <tradgn...@softcatala.org>\n" "Language: ca-XV\n" @@ -24,16 +24,16 @@ "Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../data/gnome-mines.desktop.in.in.h:1 ../src/gnome-mines.vala:95 -#: ../src/gnome-mines.vala:139 ../src/gnome-mines.vala:771 +#: ../data/gnomine.desktop.in.in.h:1 ../src/gnome-mines.vala:98 +#: ../src/gnome-mines.vala:142 ../src/gnome-mines.vala:778 msgid "Mines" msgstr "Mines" -#: ../data/gnome-mines.desktop.in.in.h:2 +#: ../data/gnomine.desktop.in.in.h:2 msgid "Clear hidden mines from a minefield" msgstr "Netegeu les mines ocultes del camp de mines" -#: ../data/gnome-mines.desktop.in.in.h:3 +#: ../data/gnomine.desktop.in.in.h:3 msgid "minesweeper;" msgstr "pescamines;" @@ -113,139 +113,143 @@ msgid "true if the window is fullscren" msgstr "«true» (cert) si la finestra està a pantalla completa" -#: ../src/gnome-mines.vala:114 +#: ../src/gnome-mines.vala:117 msgid "_New Game" msgstr "Partida _nova" -#: ../src/gnome-mines.vala:115 +#: ../src/gnome-mines.vala:118 msgid "_Replay Size" msgstr "_Repeteix la mida" -#: ../src/gnome-mines.vala:116 +#: ../src/gnome-mines.vala:119 msgid "_Hint" msgstr "_Pista" -#: ../src/gnome-mines.vala:117 ../src/gnome-mines.vala:199 -#: ../src/gnome-mines.vala:673 ../src/gnome-mines.vala:679 -#: ../src/gnome-mines.vala:680 +#: ../src/gnome-mines.vala:120 ../src/gnome-mines.vala:202 +#: ../src/gnome-mines.vala:680 ../src/gnome-mines.vala:686 +#: ../src/gnome-mines.vala:687 msgid "_Pause" msgstr "Fes una _pausa" -#: ../src/gnome-mines.vala:118 ../src/gnome-mines.vala:206 -#: ../src/gnome-mines.vala:393 +#: ../src/gnome-mines.vala:121 ../src/gnome-mines.vala:209 +#: ../src/gnome-mines.vala:398 msgid "_Fullscreen" msgstr "_Pantalla completa" -#: ../src/gnome-mines.vala:119 +#: ../src/gnome-mines.vala:122 msgid "_Scores" msgstr "Puntuacion_s" -#: ../src/gnome-mines.vala:120 +#: ../src/gnome-mines.vala:123 msgid "_Preferences" msgstr "_Preferències" -#: ../src/gnome-mines.vala:123 +#: ../src/gnome-mines.vala:126 msgid "_Help" msgstr "A_juda" -#: ../src/gnome-mines.vala:124 +#: ../src/gnome-mines.vala:127 msgid "_About" msgstr "_Quant a" -#: ../src/gnome-mines.vala:127 +#: ../src/gnome-mines.vala:130 msgid "_Quit" msgstr "S_urt" -#: ../src/gnome-mines.vala:182 +#: ../src/gnome-mines.vala:185 msgid "_New" msgstr "_Nova" -#: ../src/gnome-mines.vala:191 +#: ../src/gnome-mines.vala:194 msgid "Hint" msgstr "Pista" -#: ../src/gnome-mines.vala:256 +#: ../src/gnome-mines.vala:259 msgid "Field Size" msgstr "Mida del camp" -#: ../src/gnome-mines.vala:317 +#: ../src/gnome-mines.vala:302 +msgid "Custom" +msgstr "Personalitzada" + +#: ../src/gnome-mines.vala:320 msgid "H_orizontal:" msgstr "H_oritzontal:" -#: ../src/gnome-mines.vala:327 +#: ../src/gnome-mines.vala:330 msgid "_Vertical:" msgstr "_Vertical:" -#: ../src/gnome-mines.vala:337 +#: ../src/gnome-mines.vala:340 msgid "_Number of mines:" msgstr "_Nombre de mines:" -#: ../src/gnome-mines.vala:358 +#: ../src/gnome-mines.vala:361 msgid "_Play Game" msgstr "_Juga al joc" -#: ../src/gnome-mines.vala:388 +#: ../src/gnome-mines.vala:393 msgid "_Leave Fullscreen" msgstr "Ix de la panta_lla completa" -#: ../src/gnome-mines.vala:419 +#: ../src/gnome-mines.vala:424 #, c-format msgid "<b>%d</b> mine" msgid_plural "<b>%d</b> mines" msgstr[0] "<b>%d</b> mina" msgstr[1] "<b>%d</b> mines" -#: ../src/gnome-mines.vala:484 +#: ../src/gnome-mines.vala:489 #, c-format msgid "Flags: %u/%u" msgstr "Banderes: %u/%u" -#: ../src/gnome-mines.vala:527 +#: ../src/gnome-mines.vala:532 msgid "Do you want to start a new game?" msgstr "Voleu iniciar un joc nou?" -#: ../src/gnome-mines.vala:528 +#: ../src/gnome-mines.vala:533 msgid "If you start a new game, your current progress will be lost." msgstr "Perdreu el progrés aconseguit en el joc actual si inicieu un joc nou." -#: ../src/gnome-mines.vala:529 +#: ../src/gnome-mines.vala:534 msgid "Keep Current Game" msgstr "Mantén la partida actual" -#: ../src/gnome-mines.vala:530 +#: ../src/gnome-mines.vala:535 msgid "Start New Game" msgstr "Comença una partida nova" -#: ../src/gnome-mines.vala:669 ../src/gnome-mines.vala:671 +#: ../src/gnome-mines.vala:676 ../src/gnome-mines.vala:678 msgid "Res_ume" msgstr "Contin_ua" -#: ../src/gnome-mines.vala:720 ../src/gnome-mines.vala:1040 +#: ../src/gnome-mines.vala:727 ../src/gnome-mines.vala:1050 #, c-format msgid "Time" msgstr "Temps" -#: ../src/gnome-mines.vala:737 +#: ../src/gnome-mines.vala:744 msgid "Main game:" msgstr "Partida principal:" -#: ../src/gnome-mines.vala:742 +#: ../src/gnome-mines.vala:749 msgid "Score:" msgstr "Marcador:" -#: ../src/gnome-mines.vala:745 +#: ../src/gnome-mines.vala:752 msgid "Resizing and SVG support:" msgstr "Canvi de mida i suport SVG:" -#: ../src/gnome-mines.vala:753 +#: ../src/gnome-mines.vala:760 msgid "Faces:" msgstr "Cares:" -#: ../src/gnome-mines.vala:757 +#: ../src/gnome-mines.vala:764 msgid "Graphics:" msgstr "Gràfics:" -#: ../src/gnome-mines.vala:774 +#: ../src/gnome-mines.vala:781 msgid "" "The popular logic puzzle minesweeper. Clear mines from a board using hints " "from squares you have already uncovered.\n" @@ -257,7 +261,7 @@ "\n" "El Mines forma part dels jocs del GNOME." -#: ../src/gnome-mines.vala:781 +#: ../src/gnome-mines.vala:788 msgid "translator-credits" msgstr "" "Jordi Vila <gn...@softcatala.net>\n" @@ -267,39 +271,39 @@ "Josep Puigdemont <josep.puigdem...@gmail.com>\n" "David Planella <david.plane...@gmail.com>" -#: ../src/gnome-mines.vala:784 +#: ../src/gnome-mines.vala:791 msgid "GNOME Games web site" msgstr "Lloc web dels jocs del GNOME" -#: ../src/gnome-mines.vala:855 +#: ../src/gnome-mines.vala:862 msgid "Mines Preferences" msgstr "Preferències del Mines" -#: ../src/gnome-mines.vala:873 +#: ../src/gnome-mines.vala:880 msgid "_Use \"I'm not sure\" flags" msgstr "_Utilitza banderes «no n'estic segur»" -#: ../src/gnome-mines.vala:879 +#: ../src/gnome-mines.vala:886 msgid "_Warn if too many flags have been placed" msgstr "A_visa si s'han situat masses banderes" -#: ../src/gnome-mines.vala:885 +#: ../src/gnome-mines.vala:892 msgid "_Display numbers with border" msgstr "_Mostra els nombres amb contorn" -#: ../src/gnome-mines.vala:996 +#: ../src/gnome-mines.vala:1006 msgid "New Game" msgstr "Partida nova" -#: ../src/gnome-mines.vala:1012 +#: ../src/gnome-mines.vala:1022 msgid "Size:" msgstr "Mida:" -#: ../src/gnome-mines.vala:1037 +#: ../src/gnome-mines.vala:1047 msgid "Date" msgstr "Data" -#: ../src/gnome-mines.vala:1122 +#: ../src/gnome-mines.vala:1132 #, c-format msgid "%u × %u, %u mine" msgid_plural "%u × %u, %u mines" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/src/gnome-mines.c new/gnome-mines-3.10.1/src/gnome-mines.c --- old/gnome-mines-3.10.0/src/gnome-mines.c 2013-09-24 00:05:55.000000000 +0200 +++ new/gnome-mines-3.10.1/src/gnome-mines.c 2013-10-12 13:22:19.000000000 +0200 @@ -1,4 +1,4 @@ -/* gnome-mines.c generated by valac 0.21.1.1-0d6f, the Vala compiler +/* gnome-mines.c generated by valac 0.22.0, the Vala compiler * generated from gnome-mines.vala, do not modify */ /* @@ -527,112 +527,110 @@ const gchar* _tmp27_ = NULL; GMenu* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; - GMenu* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; GMenu* section = NULL; + GMenu* _tmp30_ = NULL; + GMenu* _tmp31_ = NULL; GMenu* _tmp32_ = NULL; GMenu* _tmp33_ = NULL; - GMenu* _tmp34_ = NULL; + const gchar* _tmp34_ = NULL; GMenu* _tmp35_ = NULL; const gchar* _tmp36_ = NULL; GMenu* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; + GMenu* _tmp38_ = NULL; GMenu* _tmp39_ = NULL; GMenu* _tmp40_ = NULL; - GMenu* _tmp41_ = NULL; + const gchar* _tmp41_ = NULL; GMenu* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - GMenu* _tmp44_ = NULL; - GtkApplicationWindow* _tmp45_ = NULL; + GtkApplicationWindow* _tmp43_ = NULL; + GtkWindow* _tmp44_ = NULL; + const gchar* _tmp45_ = NULL; GtkWindow* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; + GtkWindow* _tmp47_ = NULL; GtkWindow* _tmp48_ = NULL; GtkWindow* _tmp49_ = NULL; GtkWindow* _tmp50_ = NULL; - GtkWindow* _tmp51_ = NULL; - GtkWindow* _tmp52_ = NULL; + GSettings* _tmp51_ = NULL; + gint _tmp52_ = 0; GSettings* _tmp53_ = NULL; gint _tmp54_ = 0; GSettings* _tmp55_ = NULL; - gint _tmp56_ = 0; - GSettings* _tmp57_ = NULL; - gboolean _tmp58_ = FALSE; - GtkWindow* _tmp63_ = NULL; + gboolean _tmp56_ = FALSE; + GtkWindow* _tmp61_ = NULL; GtkBox* main_vbox = NULL; - GtkBox* _tmp64_ = NULL; - GtkWindow* _tmp65_ = NULL; + GtkBox* _tmp62_ = NULL; + GtkWindow* _tmp63_ = NULL; GtkBox* status_box = NULL; - GtkBox* _tmp66_ = NULL; + GtkBox* _tmp64_ = NULL; + GtkLabel* _tmp65_ = NULL; + GtkLabel* _tmp66_ = NULL; GtkLabel* _tmp67_ = NULL; GtkLabel* _tmp68_ = NULL; GtkLabel* _tmp69_ = NULL; GtkLabel* _tmp70_ = NULL; - GtkLabel* _tmp71_ = NULL; - GtkLabel* _tmp72_ = NULL; + GtkImage* _tmp71_ = NULL; + GtkImage* _tmp72_ = NULL; GtkImage* _tmp73_ = NULL; GtkImage* _tmp74_ = NULL; GtkImage* _tmp75_ = NULL; - GtkImage* _tmp76_ = NULL; - GtkImage* _tmp77_ = NULL; GtkToolbar* toolbar = NULL; - GtkToolbar* _tmp78_ = NULL; - GtkStyleContext* _tmp79_ = NULL; - const gchar* _tmp80_ = NULL; + GtkToolbar* _tmp76_ = NULL; + GtkStyleContext* _tmp77_ = NULL; + const gchar* _tmp78_ = NULL; + GtkToolButton* _tmp79_ = NULL; + GtkToolButton* _tmp80_ = NULL; GtkToolButton* _tmp81_ = NULL; GtkToolButton* _tmp82_ = NULL; GtkToolButton* _tmp83_ = NULL; - GtkToolButton* _tmp84_ = NULL; + GtkImage* _tmp84_ = NULL; GtkToolButton* _tmp85_ = NULL; - GtkImage* _tmp86_ = NULL; - GtkToolButton* _tmp87_ = NULL; - GtkToolButton* _tmp88_ = NULL; + GtkToolButton* _tmp86_ = NULL; GtkToolButton* hint_button = NULL; + const gchar* _tmp87_ = NULL; + GtkToolButton* _tmp88_ = NULL; const gchar* _tmp89_ = NULL; GtkToolButton* _tmp90_ = NULL; - const gchar* _tmp91_ = NULL; + GtkToolButton* _tmp91_ = NULL; GtkToolButton* _tmp92_ = NULL; GtkToolButton* _tmp93_ = NULL; GtkToolButton* _tmp94_ = NULL; GtkToolButton* _tmp95_ = NULL; - GtkToolButton* _tmp96_ = NULL; + const gchar* _tmp96_ = NULL; GtkToolButton* _tmp97_ = NULL; - const gchar* _tmp98_ = NULL; + GtkToolButton* _tmp98_ = NULL; GtkToolButton* _tmp99_ = NULL; GtkToolButton* _tmp100_ = NULL; GtkToolButton* _tmp101_ = NULL; GtkToolButton* _tmp102_ = NULL; - GtkToolButton* _tmp103_ = NULL; - GtkToolButton* _tmp104_ = NULL; GtkAlignment* status_alignment = NULL; - GtkAlignment* _tmp105_ = NULL; + GtkAlignment* _tmp103_ = NULL; GtkToolItem* status_item = NULL; - GtkToolItem* _tmp106_ = NULL; + GtkToolItem* _tmp104_ = NULL; GtkBox* view_box = NULL; - GtkBox* _tmp107_ = NULL; - MinefieldView* _tmp108_ = NULL; - MinefieldView* _tmp109_ = NULL; - GSettings* _tmp110_ = NULL; - gboolean _tmp111_ = FALSE; - MinefieldView* _tmp112_ = NULL; - GSettings* _tmp113_ = NULL; - gboolean _tmp114_ = FALSE; - MinefieldView* _tmp115_ = NULL; - GSettings* _tmp116_ = NULL; - gboolean _tmp117_ = FALSE; - MinefieldView* _tmp118_ = NULL; - GSettings* _tmp119_ = NULL; - gboolean _tmp120_ = FALSE; + GtkBox* _tmp105_ = NULL; + MinefieldView* _tmp106_ = NULL; + MinefieldView* _tmp107_ = NULL; + GSettings* _tmp108_ = NULL; + gboolean _tmp109_ = FALSE; + MinefieldView* _tmp110_ = NULL; + GSettings* _tmp111_ = NULL; + gboolean _tmp112_ = FALSE; + MinefieldView* _tmp113_ = NULL; + GSettings* _tmp114_ = NULL; + gboolean _tmp115_ = FALSE; + MinefieldView* _tmp116_ = NULL; + GSettings* _tmp117_ = NULL; + gboolean _tmp118_ = FALSE; + MinefieldView* _tmp119_ = NULL; + MinefieldView* _tmp120_ = NULL; MinefieldView* _tmp121_ = NULL; MinefieldView* _tmp122_ = NULL; - MinefieldView* _tmp123_ = NULL; - MinefieldView* _tmp124_ = NULL; - GtkAspectFrame* _tmp125_ = NULL; - GtkAspectFrame* _tmp126_ = NULL; - const gchar* _tmp127_ = NULL; - gchar* _tmp128_ = NULL; - gchar* _tmp129_ = NULL; - History* _tmp130_ = NULL; - History* _tmp131_ = NULL; + GtkAspectFrame* _tmp123_ = NULL; + GtkAspectFrame* _tmp124_ = NULL; + const gchar* _tmp125_ = NULL; + gchar* _tmp126_ = NULL; + gchar* _tmp127_ = NULL; + History* _tmp128_ = NULL; + History* _tmp129_ = NULL; self = (Mines*) base; G_APPLICATION_CLASS (mines_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication)); _tmp0_ = _ ("Mines"); @@ -681,42 +679,39 @@ _tmp21_ = _ ("_Replay Size"); g_menu_append (_tmp20_, _tmp21_, "app.repeat-size"); _tmp22_ = self->priv->app_main_menu; - _tmp23_ = _ ("_Hint"); - g_menu_append (_tmp22_, _tmp23_, "app.hint"); + _tmp23_ = _ ("_Pause"); + g_menu_append (_tmp22_, _tmp23_, "app.pause"); _tmp24_ = self->priv->app_main_menu; - _tmp25_ = _ ("_Pause"); - g_menu_append (_tmp24_, _tmp25_, "app.pause"); + _tmp25_ = _ ("_Fullscreen"); + g_menu_append (_tmp24_, _tmp25_, "app.fullscreen"); _tmp26_ = self->priv->app_main_menu; - _tmp27_ = _ ("_Fullscreen"); - g_menu_append (_tmp26_, _tmp27_, "app.fullscreen"); + _tmp27_ = _ ("_Scores"); + g_menu_append (_tmp26_, _tmp27_, "app.scores"); _tmp28_ = self->priv->app_main_menu; - _tmp29_ = _ ("_Scores"); - g_menu_append (_tmp28_, _tmp29_, "app.scores"); - _tmp30_ = self->priv->app_main_menu; - _tmp31_ = _ ("_Preferences"); - g_menu_append (_tmp30_, _tmp31_, "app.preferences"); - _tmp32_ = g_menu_new (); - section = _tmp32_; - _tmp33_ = menu; - _tmp34_ = section; - g_menu_append_section (_tmp33_, NULL, (GMenuModel*) _tmp34_); + _tmp29_ = _ ("_Preferences"); + g_menu_append (_tmp28_, _tmp29_, "app.preferences"); + _tmp30_ = g_menu_new (); + section = _tmp30_; + _tmp31_ = menu; + _tmp32_ = section; + g_menu_append_section (_tmp31_, NULL, (GMenuModel*) _tmp32_); + _tmp33_ = section; + _tmp34_ = _ ("_Help"); + g_menu_append (_tmp33_, _tmp34_, "app.help"); _tmp35_ = section; - _tmp36_ = _ ("_Help"); - g_menu_append (_tmp35_, _tmp36_, "app.help"); - _tmp37_ = section; - _tmp38_ = _ ("_About"); - g_menu_append (_tmp37_, _tmp38_, "app.about"); - _tmp39_ = g_menu_new (); + _tmp36_ = _ ("_About"); + g_menu_append (_tmp35_, _tmp36_, "app.about"); + _tmp37_ = g_menu_new (); _g_object_unref0 (section); - section = _tmp39_; - _tmp40_ = menu; - _tmp41_ = section; - g_menu_append_section (_tmp40_, NULL, (GMenuModel*) _tmp41_); - _tmp42_ = section; - _tmp43_ = _ ("_Quit"); - g_menu_append (_tmp42_, _tmp43_, "app.quit"); - _tmp44_ = menu; - gtk_application_set_app_menu ((GtkApplication*) self, (GMenuModel*) _tmp44_); + section = _tmp37_; + _tmp38_ = menu; + _tmp39_ = section; + g_menu_append_section (_tmp38_, NULL, (GMenuModel*) _tmp39_); + _tmp40_ = section; + _tmp41_ = _ ("_Quit"); + g_menu_append (_tmp40_, _tmp41_, "app.quit"); + _tmp42_ = menu; + gtk_application_set_app_menu ((GtkApplication*) self, (GMenuModel*) _tmp42_); gtk_application_add_accelerator ((GtkApplication*) self, "<Primary>n", "app.new-game", NULL); gtk_application_add_accelerator ((GtkApplication*) self, "<Primary>r", "app.repeat-size", NULL); gtk_application_add_accelerator ((GtkApplication*) self, "Pause", "app.pause", NULL); @@ -724,216 +719,216 @@ gtk_application_add_accelerator ((GtkApplication*) self, "F1", "app.help", NULL); gtk_application_add_accelerator ((GtkApplication*) self, "<Primary>w", "app.quit", NULL); gtk_application_add_accelerator ((GtkApplication*) self, "<Primary>q", "app.quit", NULL); - _tmp45_ = (GtkApplicationWindow*) gtk_application_window_new ((GtkApplication*) self); - g_object_ref_sink (_tmp45_); + _tmp43_ = (GtkApplicationWindow*) gtk_application_window_new ((GtkApplication*) self); + g_object_ref_sink (_tmp43_); _g_object_unref0 (self->priv->window); - self->priv->window = (GtkWindow*) _tmp45_; + self->priv->window = (GtkWindow*) _tmp43_; + _tmp44_ = self->priv->window; + _tmp45_ = _ ("Mines"); + gtk_window_set_title (_tmp44_, _tmp45_); _tmp46_ = self->priv->window; - _tmp47_ = _ ("Mines"); - gtk_window_set_title (_tmp46_, _tmp47_); + g_signal_connect_object ((GtkWidget*) _tmp46_, "configure-event", (GCallback) _mines_window_configure_event_cb_gtk_widget_configure_event, self, 0); + _tmp47_ = self->priv->window; + g_signal_connect_object ((GtkWidget*) _tmp47_, "window-state-event", (GCallback) _mines_window_state_event_cb_gtk_widget_window_state_event, self, 0); _tmp48_ = self->priv->window; - g_signal_connect_object ((GtkWidget*) _tmp48_, "configure-event", (GCallback) _mines_window_configure_event_cb_gtk_widget_configure_event, self, 0); + g_signal_connect_object ((GtkWidget*) _tmp48_, "focus-out-event", (GCallback) _mines_window_focus_out_event_cb_gtk_widget_focus_out_event, self, 0); _tmp49_ = self->priv->window; - g_signal_connect_object ((GtkWidget*) _tmp49_, "window-state-event", (GCallback) _mines_window_state_event_cb_gtk_widget_window_state_event, self, 0); + g_signal_connect_object ((GtkWidget*) _tmp49_, "focus-in-event", (GCallback) _mines_window_focus_in_event_cb_gtk_widget_focus_in_event, self, 0); _tmp50_ = self->priv->window; - g_signal_connect_object ((GtkWidget*) _tmp50_, "focus-out-event", (GCallback) _mines_window_focus_out_event_cb_gtk_widget_focus_out_event, self, 0); - _tmp51_ = self->priv->window; - g_signal_connect_object ((GtkWidget*) _tmp51_, "focus-in-event", (GCallback) _mines_window_focus_in_event_cb_gtk_widget_focus_in_event, self, 0); - _tmp52_ = self->priv->window; + _tmp51_ = self->priv->settings; + _tmp52_ = g_settings_get_int (_tmp51_, "window-width"); _tmp53_ = self->priv->settings; - _tmp54_ = g_settings_get_int (_tmp53_, "window-width"); + _tmp54_ = g_settings_get_int (_tmp53_, "window-height"); + gtk_window_set_default_size (_tmp50_, _tmp52_, _tmp54_); _tmp55_ = self->priv->settings; - _tmp56_ = g_settings_get_int (_tmp55_, "window-height"); - gtk_window_set_default_size (_tmp52_, _tmp54_, _tmp56_); - _tmp57_ = self->priv->settings; - _tmp58_ = g_settings_get_boolean (_tmp57_, "window-is-fullscreen"); - if (_tmp58_) { - GtkWindow* _tmp59_ = NULL; - _tmp59_ = self->priv->window; - gtk_window_fullscreen (_tmp59_); + _tmp56_ = g_settings_get_boolean (_tmp55_, "window-is-fullscreen"); + if (_tmp56_) { + GtkWindow* _tmp57_ = NULL; + _tmp57_ = self->priv->window; + gtk_window_fullscreen (_tmp57_); } else { - GSettings* _tmp60_ = NULL; - gboolean _tmp61_ = FALSE; - _tmp60_ = self->priv->settings; - _tmp61_ = g_settings_get_boolean (_tmp60_, "window-is-maximized"); - if (_tmp61_) { - GtkWindow* _tmp62_ = NULL; - _tmp62_ = self->priv->window; - gtk_window_maximize (_tmp62_); + GSettings* _tmp58_ = NULL; + gboolean _tmp59_ = FALSE; + _tmp58_ = self->priv->settings; + _tmp59_ = g_settings_get_boolean (_tmp58_, "window-is-maximized"); + if (_tmp59_) { + GtkWindow* _tmp60_ = NULL; + _tmp60_ = self->priv->window; + gtk_window_maximize (_tmp60_); } } + _tmp61_ = self->priv->window; + gtk_application_add_window ((GtkApplication*) self, _tmp61_); + _tmp62_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + g_object_ref_sink (_tmp62_); + main_vbox = _tmp62_; _tmp63_ = self->priv->window; - gtk_application_add_window ((GtkApplication*) self, _tmp63_); - _tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - g_object_ref_sink (_tmp64_); - main_vbox = _tmp64_; - _tmp65_ = self->priv->window; - gtk_container_add ((GtkContainer*) _tmp65_, (GtkWidget*) main_vbox); + gtk_container_add ((GtkContainer*) _tmp63_, (GtkWidget*) main_vbox); gtk_widget_show ((GtkWidget*) main_vbox); - _tmp66_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - g_object_ref_sink (_tmp66_); - status_box = _tmp66_; + _tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); + g_object_ref_sink (_tmp64_); + status_box = _tmp64_; gtk_widget_show ((GtkWidget*) status_box); - _tmp67_ = (GtkLabel*) gtk_label_new (""); - g_object_ref_sink (_tmp67_); + _tmp65_ = (GtkLabel*) gtk_label_new (""); + g_object_ref_sink (_tmp65_); _g_object_unref0 (self->priv->flag_label); - self->priv->flag_label = _tmp67_; - _tmp68_ = self->priv->flag_label; - gtk_widget_show ((GtkWidget*) _tmp68_); - _tmp69_ = self->priv->flag_label; - gtk_box_pack_start (status_box, (GtkWidget*) _tmp69_, FALSE, FALSE, (guint) 0); - _tmp70_ = (GtkLabel*) gtk_label_new (""); - g_object_ref_sink (_tmp70_); + self->priv->flag_label = _tmp65_; + _tmp66_ = self->priv->flag_label; + gtk_widget_show ((GtkWidget*) _tmp66_); + _tmp67_ = self->priv->flag_label; + gtk_box_pack_start (status_box, (GtkWidget*) _tmp67_, FALSE, FALSE, (guint) 0); + _tmp68_ = (GtkLabel*) gtk_label_new (""); + g_object_ref_sink (_tmp68_); _g_object_unref0 (self->priv->clock_label); - self->priv->clock_label = _tmp70_; - _tmp71_ = self->priv->clock_label; - gtk_widget_show ((GtkWidget*) _tmp71_); - _tmp72_ = self->priv->clock_label; - gtk_box_pack_start (status_box, (GtkWidget*) _tmp72_, FALSE, FALSE, (guint) 0); - _tmp73_ = mines_load_face_image (self, "face-win.svg"); + self->priv->clock_label = _tmp68_; + _tmp69_ = self->priv->clock_label; + gtk_widget_show ((GtkWidget*) _tmp69_); + _tmp70_ = self->priv->clock_label; + gtk_box_pack_start (status_box, (GtkWidget*) _tmp70_, FALSE, FALSE, (guint) 0); + _tmp71_ = mines_load_face_image (self, "face-win.svg"); _g_object_unref0 (self->priv->win_face_image); - self->priv->win_face_image = _tmp73_; - _tmp74_ = mines_load_face_image (self, "face-sad.svg"); + self->priv->win_face_image = _tmp71_; + _tmp72_ = mines_load_face_image (self, "face-sad.svg"); _g_object_unref0 (self->priv->sad_face_image); - self->priv->sad_face_image = _tmp74_; - _tmp75_ = mines_load_face_image (self, "face-smile.svg"); + self->priv->sad_face_image = _tmp72_; + _tmp73_ = mines_load_face_image (self, "face-smile.svg"); _g_object_unref0 (self->priv->smile_face_image); - self->priv->smile_face_image = _tmp75_; - _tmp76_ = mines_load_face_image (self, "face-cool.svg"); + self->priv->smile_face_image = _tmp73_; + _tmp74_ = mines_load_face_image (self, "face-cool.svg"); _g_object_unref0 (self->priv->cool_face_image); - self->priv->cool_face_image = _tmp76_; - _tmp77_ = mines_load_face_image (self, "face-worried.svg"); + self->priv->cool_face_image = _tmp74_; + _tmp75_ = mines_load_face_image (self, "face-worried.svg"); _g_object_unref0 (self->priv->worried_face_image); - self->priv->worried_face_image = _tmp77_; - _tmp78_ = (GtkToolbar*) gtk_toolbar_new (); - g_object_ref_sink (_tmp78_); - toolbar = _tmp78_; + self->priv->worried_face_image = _tmp75_; + _tmp76_ = (GtkToolbar*) gtk_toolbar_new (); + g_object_ref_sink (_tmp76_); + toolbar = _tmp76_; gtk_widget_show ((GtkWidget*) toolbar); gtk_toolbar_set_show_arrow (toolbar, FALSE); - _tmp79_ = gtk_widget_get_style_context ((GtkWidget*) toolbar); - gtk_style_context_add_class (_tmp79_, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); - _tmp80_ = _ ("_New"); - _tmp81_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp80_); - g_object_ref_sink (_tmp81_); + _tmp77_ = gtk_widget_get_style_context ((GtkWidget*) toolbar); + gtk_style_context_add_class (_tmp77_, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + _tmp78_ = _ ("_New"); + _tmp79_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp78_); + g_object_ref_sink (_tmp79_); _g_object_unref0 (self->priv->face_button); - self->priv->face_button = _tmp81_; + self->priv->face_button = _tmp79_; + _tmp80_ = self->priv->face_button; + gtk_tool_button_set_use_underline (_tmp80_, TRUE); + _tmp81_ = self->priv->face_button; + gtk_tool_button_set_icon_name (_tmp81_, "document-new"); _tmp82_ = self->priv->face_button; - gtk_tool_button_set_use_underline (_tmp82_, TRUE); + gtk_actionable_set_action_name ((GtkActionable*) _tmp82_, "app.new-game"); _tmp83_ = self->priv->face_button; - gtk_tool_button_set_icon_name (_tmp83_, "document-new"); - _tmp84_ = self->priv->face_button; - gtk_actionable_set_action_name ((GtkActionable*) _tmp84_, "app.new-game"); + gtk_tool_item_set_is_important ((GtkToolItem*) _tmp83_, TRUE); + _tmp84_ = self->priv->smile_face_image; + mines_set_face_image (self, _tmp84_); _tmp85_ = self->priv->face_button; - gtk_tool_item_set_is_important ((GtkToolItem*) _tmp85_, TRUE); - _tmp86_ = self->priv->smile_face_image; - mines_set_face_image (self, _tmp86_); - _tmp87_ = self->priv->face_button; - gtk_widget_show ((GtkWidget*) _tmp87_); - _tmp88_ = self->priv->face_button; - gtk_toolbar_insert (toolbar, (GtkToolItem*) _tmp88_, -1); - _tmp89_ = _ ("Hint"); - _tmp90_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp89_); - g_object_ref_sink (_tmp90_); - hint_button = _tmp90_; + gtk_widget_show ((GtkWidget*) _tmp85_); + _tmp86_ = self->priv->face_button; + gtk_toolbar_insert (toolbar, (GtkToolItem*) _tmp86_, -1); + _tmp87_ = _ ("Hint"); + _tmp88_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp87_); + g_object_ref_sink (_tmp88_); + hint_button = _tmp88_; gtk_tool_button_set_use_underline (hint_button, TRUE); gtk_tool_button_set_icon_name (hint_button, "dialog-information"); gtk_actionable_set_action_name ((GtkActionable*) hint_button, "app.hint"); gtk_tool_item_set_is_important ((GtkToolItem*) hint_button, TRUE); gtk_widget_show ((GtkWidget*) hint_button); gtk_toolbar_insert (toolbar, (GtkToolItem*) hint_button, -1); - _tmp91_ = _ ("_Pause"); - _tmp92_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp91_); - g_object_ref_sink (_tmp92_); + _tmp89_ = _ ("_Pause"); + _tmp90_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp89_); + g_object_ref_sink (_tmp90_); _g_object_unref0 (self->priv->pause_button); - self->priv->pause_button = _tmp92_; + self->priv->pause_button = _tmp90_; + _tmp91_ = self->priv->pause_button; + gtk_tool_button_set_icon_name (_tmp91_, "media-playback-pause"); + _tmp92_ = self->priv->pause_button; + gtk_tool_button_set_use_underline (_tmp92_, TRUE); _tmp93_ = self->priv->pause_button; - gtk_tool_button_set_icon_name (_tmp93_, "media-playback-pause"); + gtk_actionable_set_action_name ((GtkActionable*) _tmp93_, "app.pause"); _tmp94_ = self->priv->pause_button; - gtk_tool_button_set_use_underline (_tmp94_, TRUE); + gtk_widget_show ((GtkWidget*) _tmp94_); _tmp95_ = self->priv->pause_button; - gtk_actionable_set_action_name ((GtkActionable*) _tmp95_, "app.pause"); - _tmp96_ = self->priv->pause_button; - gtk_widget_show ((GtkWidget*) _tmp96_); - _tmp97_ = self->priv->pause_button; - gtk_toolbar_insert (toolbar, (GtkToolItem*) _tmp97_, -1); - _tmp98_ = _ ("_Fullscreen"); - _tmp99_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp98_); - g_object_ref_sink (_tmp99_); + gtk_toolbar_insert (toolbar, (GtkToolItem*) _tmp95_, -1); + _tmp96_ = _ ("_Fullscreen"); + _tmp97_ = (GtkToolButton*) gtk_tool_button_new (NULL, _tmp96_); + g_object_ref_sink (_tmp97_); _g_object_unref0 (self->priv->fullscreen_button); - self->priv->fullscreen_button = _tmp99_; + self->priv->fullscreen_button = _tmp97_; + _tmp98_ = self->priv->fullscreen_button; + gtk_tool_button_set_icon_name (_tmp98_, "view-fullscreen"); + _tmp99_ = self->priv->fullscreen_button; + gtk_tool_button_set_use_underline (_tmp99_, TRUE); _tmp100_ = self->priv->fullscreen_button; - gtk_tool_button_set_icon_name (_tmp100_, "view-fullscreen"); + gtk_actionable_set_action_name ((GtkActionable*) _tmp100_, "app.fullscreen"); _tmp101_ = self->priv->fullscreen_button; - gtk_tool_button_set_use_underline (_tmp101_, TRUE); + gtk_widget_show ((GtkWidget*) _tmp101_); _tmp102_ = self->priv->fullscreen_button; - gtk_actionable_set_action_name ((GtkActionable*) _tmp102_, "app.fullscreen"); - _tmp103_ = self->priv->fullscreen_button; - gtk_widget_show ((GtkWidget*) _tmp103_); - _tmp104_ = self->priv->fullscreen_button; - gtk_toolbar_insert (toolbar, (GtkToolItem*) _tmp104_, -1); - _tmp105_ = (GtkAlignment*) gtk_alignment_new (1.0f, 0.5f, 0.0f, 0.0f); - g_object_ref_sink (_tmp105_); - status_alignment = _tmp105_; + gtk_toolbar_insert (toolbar, (GtkToolItem*) _tmp102_, -1); + _tmp103_ = (GtkAlignment*) gtk_alignment_new (1.0f, 0.5f, 0.0f, 0.0f); + g_object_ref_sink (_tmp103_); + status_alignment = _tmp103_; gtk_container_add ((GtkContainer*) status_alignment, (GtkWidget*) status_box); gtk_widget_show ((GtkWidget*) status_alignment); - _tmp106_ = gtk_tool_item_new (); - g_object_ref_sink (_tmp106_); - status_item = _tmp106_; + _tmp104_ = gtk_tool_item_new (); + g_object_ref_sink (_tmp104_); + status_item = _tmp104_; gtk_tool_item_set_expand (status_item, TRUE); gtk_container_add ((GtkContainer*) status_item, (GtkWidget*) status_alignment); gtk_widget_show ((GtkWidget*) status_item); gtk_toolbar_insert (toolbar, status_item, -1); gtk_box_pack_start (main_vbox, (GtkWidget*) toolbar, FALSE, FALSE, (guint) 0); - _tmp107_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - g_object_ref_sink (_tmp107_); - view_box = _tmp107_; + _tmp105_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + g_object_ref_sink (_tmp105_); + view_box = _tmp105_; gtk_container_set_border_width ((GtkContainer*) view_box, (guint) 3); gtk_widget_show ((GtkWidget*) view_box); gtk_box_pack_start (main_vbox, (GtkWidget*) view_box, TRUE, TRUE, (guint) 0); - _tmp108_ = minefield_view_new (); - g_object_ref_sink (_tmp108_); + _tmp106_ = minefield_view_new (); + g_object_ref_sink (_tmp106_); _g_object_unref0 (self->priv->minefield_view); - self->priv->minefield_view = _tmp108_; - _tmp109_ = self->priv->minefield_view; - _tmp110_ = self->priv->settings; - _tmp111_ = g_settings_get_boolean (_tmp110_, MINES_KEY_USE_QUESTION_MARKS); - minefield_view_set_use_question_marks (_tmp109_, _tmp111_); - _tmp112_ = self->priv->minefield_view; - _tmp113_ = self->priv->settings; - _tmp114_ = g_settings_get_boolean (_tmp113_, MINES_KEY_USE_OVERMINE_WARNING); - minefield_view_set_use_overmine_warning (_tmp112_, _tmp114_); - _tmp115_ = self->priv->minefield_view; - _tmp116_ = self->priv->settings; - _tmp117_ = g_settings_get_boolean (_tmp116_, MINES_KEY_USE_AUTOFLAG); - minefield_view_set_use_autoflag (_tmp115_, _tmp117_); - _tmp118_ = self->priv->minefield_view; - _tmp119_ = self->priv->settings; - _tmp120_ = g_settings_get_boolean (_tmp119_, MINES_KEY_USE_NUMBER_BORDER); - minefield_view_set_use_number_border (_tmp118_, _tmp120_); + self->priv->minefield_view = _tmp106_; + _tmp107_ = self->priv->minefield_view; + _tmp108_ = self->priv->settings; + _tmp109_ = g_settings_get_boolean (_tmp108_, MINES_KEY_USE_QUESTION_MARKS); + minefield_view_set_use_question_marks (_tmp107_, _tmp109_); + _tmp110_ = self->priv->minefield_view; + _tmp111_ = self->priv->settings; + _tmp112_ = g_settings_get_boolean (_tmp111_, MINES_KEY_USE_OVERMINE_WARNING); + minefield_view_set_use_overmine_warning (_tmp110_, _tmp112_); + _tmp113_ = self->priv->minefield_view; + _tmp114_ = self->priv->settings; + _tmp115_ = g_settings_get_boolean (_tmp114_, MINES_KEY_USE_AUTOFLAG); + minefield_view_set_use_autoflag (_tmp113_, _tmp115_); + _tmp116_ = self->priv->minefield_view; + _tmp117_ = self->priv->settings; + _tmp118_ = g_settings_get_boolean (_tmp117_, MINES_KEY_USE_NUMBER_BORDER); + minefield_view_set_use_number_border (_tmp116_, _tmp118_); + _tmp119_ = self->priv->minefield_view; + g_signal_connect_object ((GtkWidget*) _tmp119_, "button-press-event", (GCallback) _mines_view_button_press_event_gtk_widget_button_press_event, self, 0); + _tmp120_ = self->priv->minefield_view; + g_signal_connect_object (_tmp120_, "look", (GCallback) _mines_look_cb_minefield_view_look, self, 0); _tmp121_ = self->priv->minefield_view; - g_signal_connect_object ((GtkWidget*) _tmp121_, "button-press-event", (GCallback) _mines_view_button_press_event_gtk_widget_button_press_event, self, 0); + g_signal_connect_object (_tmp121_, "unlook", (GCallback) _mines_unlook_cb_minefield_view_unlook, self, 0); _tmp122_ = self->priv->minefield_view; - g_signal_connect_object (_tmp122_, "look", (GCallback) _mines_look_cb_minefield_view_look, self, 0); - _tmp123_ = self->priv->minefield_view; - g_signal_connect_object (_tmp123_, "unlook", (GCallback) _mines_unlook_cb_minefield_view_unlook, self, 0); - _tmp124_ = self->priv->minefield_view; - gtk_box_pack_start (view_box, (GtkWidget*) _tmp124_, TRUE, TRUE, (guint) 0); + gtk_box_pack_start (view_box, (GtkWidget*) _tmp122_, TRUE, TRUE, (guint) 0); mines_startup_new_game_screen (self); - _tmp125_ = self->priv->new_game_screen; - gtk_box_pack_start (view_box, (GtkWidget*) _tmp125_, TRUE, TRUE, (guint) 0); + _tmp123_ = self->priv->new_game_screen; + gtk_box_pack_start (view_box, (GtkWidget*) _tmp123_, TRUE, TRUE, (guint) 0); mines_startup_custom_game_screen (self); - _tmp126_ = self->priv->custom_game_screen; - gtk_box_pack_start (view_box, (GtkWidget*) _tmp126_, TRUE, FALSE, (guint) 0); + _tmp124_ = self->priv->custom_game_screen; + gtk_box_pack_start (view_box, (GtkWidget*) _tmp124_, TRUE, FALSE, (guint) 0); mines_tick_cb (self); - _tmp127_ = g_get_user_data_dir (); - _tmp128_ = g_build_filename (_tmp127_, "gnome-mines", "history", NULL); - _tmp129_ = _tmp128_; - _tmp130_ = history_new (_tmp129_); + _tmp125_ = g_get_user_data_dir (); + _tmp126_ = g_build_filename (_tmp125_, "gnome-mines", "history", NULL); + _tmp127_ = _tmp126_; + _tmp128_ = history_new (_tmp127_); _history_unref0 (self->priv->history); - self->priv->history = _tmp130_; - _g_free0 (_tmp129_); - _tmp131_ = self->priv->history; - history_load (_tmp131_); + self->priv->history = _tmp128_; + _g_free0 (_tmp127_); + _tmp129_ = self->priv->history; + history_load (_tmp129_); _g_object_unref0 (view_box); _g_object_unref0 (status_item); _g_object_unref0 (status_alignment); @@ -2128,7 +2123,7 @@ gboolean _tmp3_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = self->priv->app_main_menu; - g_menu_remove (_tmp0_, 3); + g_menu_remove (_tmp0_, 2); _tmp1_ = self->priv->minefield; _tmp2_ = minefield_get_paused (_tmp1_); _tmp3_ = _tmp2_; @@ -2151,13 +2146,13 @@ const gchar* _tmp10_ = NULL; _tmp9_ = self->priv->app_main_menu; _tmp10_ = _ ("Res_ume"); - g_menu_insert (_tmp9_, 3, _tmp10_, "app.pause"); + g_menu_insert (_tmp9_, 2, _tmp10_, "app.pause"); } else { GMenu* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; _tmp11_ = self->priv->app_main_menu; _tmp12_ = _ ("_Pause"); - g_menu_insert (_tmp11_, 3, _tmp12_, "app.pause"); + g_menu_insert (_tmp11_, 2, _tmp12_, "app.pause"); } } else { GSimpleAction* _tmp13_ = NULL; @@ -2175,7 +2170,7 @@ gtk_tool_button_set_label (_tmp15_, _tmp16_); _tmp17_ = self->priv->app_main_menu; _tmp18_ = _ ("_Pause"); - g_menu_insert (_tmp17_, 3, _tmp18_, "app.pause"); + g_menu_insert (_tmp17_, 2, _tmp18_, "app.pause"); } } @@ -2844,7 +2839,7 @@ _inner_error_ = NULL; _tmp3_ = e; _tmp4_ = _tmp3_->message; - g_warning ("gnome-mines.vala:955: Failed to show help: %s", _tmp4_); + g_warning ("gnome-mines.vala:954: Failed to show help: %s", _tmp4_); _g_error_free0 (e); } __finally0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/src/gnome-mines.vala new/gnome-mines-3.10.1/src/gnome-mines.vala --- old/gnome-mines-3.10.0/src/gnome-mines.vala 2013-09-24 00:05:46.000000000 +0200 +++ new/gnome-mines-3.10.1/src/gnome-mines.vala 2013-10-12 13:18:07.000000000 +0200 @@ -116,7 +116,6 @@ menu.append_section (null, app_main_menu); app_main_menu.append (_("_New Game"), "app.new-game"); app_main_menu.append (_("_Replay Size"), "app.repeat-size"); - app_main_menu.append (_("_Hint"), "app.hint"); app_main_menu.append (_("_Pause"), "app.pause"); app_main_menu.append (_("_Fullscreen"), "app.fullscreen"); app_main_menu.append (_("_Scores"), "app.scores"); @@ -667,7 +666,7 @@ * but it doesn't seem we have much of an option, lets just * hope the C compiler can optimise this. */ - app_main_menu.remove (3); // Remove pause/resume menuitem + app_main_menu.remove (2); // Remove pause/resume menuitem if (minefield.paused) { @@ -675,16 +674,16 @@ pause_button.icon_name = "media-playback-start"; pause_button.label = _("Res_ume"); if (pause_requested) - app_main_menu.insert (3, _("Res_ume"), "app.pause"); + app_main_menu.insert (2, _("Res_ume"), "app.pause"); else - app_main_menu.insert (3, _("_Pause"), "app.pause"); + app_main_menu.insert (2, _("_Pause"), "app.pause"); } else { hint_action.set_enabled (true); pause_button.icon_name = "media-playback-pause"; pause_button.label = _("_Pause"); - app_main_menu.insert (3, _("_Pause"), "app.pause"); + app_main_menu.insert (2, _("_Pause"), "app.pause"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/src/history.c new/gnome-mines-3.10.1/src/history.c --- old/gnome-mines-3.10.0/src/history.c 2013-09-24 00:05:55.000000000 +0200 +++ new/gnome-mines-3.10.1/src/history.c 2013-10-12 13:22:19.000000000 +0200 @@ -1,4 +1,4 @@ -/* history.c generated by valac 0.21.1.1-0d6f, the Vala compiler +/* history.c generated by valac 0.22.0, the Vala compiler * generated from history.vala, do not modify */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/src/minefield-view.c new/gnome-mines-3.10.1/src/minefield-view.c --- old/gnome-mines-3.10.0/src/minefield-view.c 2013-09-24 00:05:55.000000000 +0200 +++ new/gnome-mines-3.10.1/src/minefield-view.c 2013-10-12 13:22:20.000000000 +0200 @@ -1,4 +1,4 @@ -/* minefield-view.c generated by valac 0.21.1.1-0d6f, the Vala compiler +/* minefield-view.c generated by valac 0.22.0, the Vala compiler * generated from minefield-view.vala, do not modify */ /* @@ -70,7 +70,7 @@ #define _g_free0(var) (var = (g_free (var), NULL)) #define _pango_attribute_destroy0(var) ((var == NULL) ? NULL : (var = (pango_attribute_destroy (var), NULL))) #define __vala_PangoFontDescription_free0(var) ((var == NULL) ? NULL : (var = (_vala_PangoFontDescription_free (var), NULL))) -#define __vala_PangoAttrList_free0(var) ((var == NULL) ? NULL : (var = (_vala_PangoAttrList_free (var), NULL))) +#define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL))) #define TYPE_NEIGHBOUR (neighbour_get_type ()) typedef struct _Neighbour Neighbour; @@ -200,9 +200,7 @@ static cairo_pattern_t* minefield_view_render_svg_pattern (MinefieldView* self, cairo_t* cr, const gchar* filename); static guint minefield_view_get_mine_size (MinefieldView* self); static cairo_pattern_t* minefield_view_render_number_pattern (MinefieldView* self, guint n); -static PangoAttrList* _vala_PangoAttrList_copy (PangoAttrList* self); static void _vala_PangoFontDescription_free (PangoFontDescription* self); -static void _vala_PangoAttrList_free (PangoAttrList* self); static void minefield_view_real_get_preferred_width (GtkWidget* base, gint* minimum, gint* natural); Minefield* minefield_view_get_minefield (MinefieldView* self); static guint minefield_view_get_minimum_size (MinefieldView* self); @@ -1014,26 +1012,11 @@ } -static PangoAttrList* _vala_PangoAttrList_copy (PangoAttrList* self) { - return g_boxed_copy (pango_attr_list_get_type (), self); -} - - -static gpointer __vala_PangoAttrList_copy0 (gpointer self) { - return self ? _vala_PangoAttrList_copy (self) : NULL; -} - - static void _vala_PangoFontDescription_free (PangoFontDescription* self) { g_boxed_free (pango_font_description_get_type (), self); } -static void _vala_PangoAttrList_free (PangoAttrList* self) { - g_boxed_free (pango_attr_list_get_type (), self); -} - - static cairo_pattern_t* minefield_view_render_number_pattern (MinefieldView* self, guint n) { cairo_pattern_t* result = NULL; PangoLayout* layout = NULL; @@ -1072,38 +1055,37 @@ PangoAttrFontDesc* _tmp42_ = NULL; PangoLayout* _tmp43_ = NULL; PangoAttrList* _tmp44_ = NULL; - PangoAttrList* _tmp45_ = NULL; cairo_surface_t* surface = NULL; + guint _tmp45_ = 0U; guint _tmp46_ = 0U; guint _tmp47_ = 0U; guint _tmp48_ = 0U; - guint _tmp49_ = 0U; - cairo_surface_t* _tmp50_ = NULL; + cairo_surface_t* _tmp49_ = NULL; cairo_t* c = NULL; - cairo_surface_t* _tmp51_ = NULL; - cairo_t* _tmp52_ = NULL; + cairo_surface_t* _tmp50_ = NULL; + cairo_t* _tmp51_ = NULL; PangoRectangle extent = {0}; - PangoLayout* _tmp53_ = NULL; - PangoRectangle _tmp54_ = {0}; + PangoLayout* _tmp52_ = NULL; + PangoRectangle _tmp53_ = {0}; gint dx = 0; + guint _tmp54_ = 0U; guint _tmp55_ = 0U; - guint _tmp56_ = 0U; - PangoRectangle _tmp57_ = {0}; - gint _tmp58_ = 0; + PangoRectangle _tmp56_ = {0}; + gint _tmp57_ = 0; gint dy = 0; + guint _tmp58_ = 0U; guint _tmp59_ = 0U; - guint _tmp60_ = 0U; - PangoRectangle _tmp61_ = {0}; - gint _tmp62_ = 0; - cairo_t* _tmp63_ = NULL; + PangoRectangle _tmp60_ = {0}; + gint _tmp61_ = 0; + cairo_t* _tmp62_ = NULL; + gint _tmp63_ = 0; gint _tmp64_ = 0; - gint _tmp65_ = 0; - cairo_t* _tmp66_ = NULL; - PangoLayout* _tmp67_ = NULL; - gboolean _tmp68_ = FALSE; + cairo_t* _tmp65_ = NULL; + PangoLayout* _tmp66_ = NULL; + gboolean _tmp67_ = FALSE; cairo_pattern_t* pattern = NULL; - cairo_surface_t* _tmp79_ = NULL; - cairo_pattern_t* _tmp80_ = NULL; + cairo_surface_t* _tmp78_ = NULL; + cairo_pattern_t* _tmp79_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = n; _tmp1_ = g_strdup_printf ("%u", _tmp0_); @@ -1259,69 +1241,68 @@ pango_attr_list_insert (_tmp41_, (PangoAttribute*) _tmp42_); _tmp43_ = layout; _tmp44_ = attributes; - _tmp45_ = __vala_PangoAttrList_copy0 (_tmp44_); - pango_layout_set_attributes (_tmp43_, _tmp45_); - _tmp46_ = minefield_view_get_mine_size (self); - _tmp47_ = _tmp46_; - _tmp48_ = minefield_view_get_mine_size (self); - _tmp49_ = _tmp48_; - _tmp50_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, (gint) _tmp47_, (gint) _tmp49_); - surface = _tmp50_; - _tmp51_ = surface; - _tmp52_ = cairo_create (_tmp51_); - c = _tmp52_; - _tmp53_ = layout; - pango_layout_get_extents (_tmp53_, NULL, &_tmp54_); - extent = _tmp54_; - _tmp55_ = minefield_view_get_mine_size (self); - _tmp56_ = _tmp55_; - _tmp57_ = extent; - _tmp58_ = _tmp57_.width; - dx = (((((gint) _tmp56_) - 2) - (_tmp58_ / PANGO_SCALE)) / 2) + 1; - _tmp59_ = minefield_view_get_mine_size (self); - _tmp60_ = _tmp59_; - _tmp61_ = extent; - _tmp62_ = _tmp61_.height; - dy = (((((gint) _tmp60_) - 2) - (_tmp62_ / PANGO_SCALE)) / 2) + 1; - _tmp63_ = c; - _tmp64_ = dx; - _tmp65_ = dy; - cairo_move_to (_tmp63_, (gdouble) _tmp64_, (gdouble) _tmp65_); - _tmp66_ = c; - _tmp67_ = layout; - pango_cairo_show_layout (_tmp66_, _tmp67_); - _tmp68_ = self->priv->use_number_border; - if (_tmp68_) { + pango_layout_set_attributes (_tmp43_, _tmp44_); + _tmp45_ = minefield_view_get_mine_size (self); + _tmp46_ = _tmp45_; + _tmp47_ = minefield_view_get_mine_size (self); + _tmp48_ = _tmp47_; + _tmp49_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, (gint) _tmp46_, (gint) _tmp48_); + surface = _tmp49_; + _tmp50_ = surface; + _tmp51_ = cairo_create (_tmp50_); + c = _tmp51_; + _tmp52_ = layout; + pango_layout_get_extents (_tmp52_, NULL, &_tmp53_); + extent = _tmp53_; + _tmp54_ = minefield_view_get_mine_size (self); + _tmp55_ = _tmp54_; + _tmp56_ = extent; + _tmp57_ = _tmp56_.width; + dx = (((((gint) _tmp55_) - 2) - (_tmp57_ / PANGO_SCALE)) / 2) + 1; + _tmp58_ = minefield_view_get_mine_size (self); + _tmp59_ = _tmp58_; + _tmp60_ = extent; + _tmp61_ = _tmp60_.height; + dy = (((((gint) _tmp59_) - 2) - (_tmp61_ / PANGO_SCALE)) / 2) + 1; + _tmp62_ = c; + _tmp63_ = dx; + _tmp64_ = dy; + cairo_move_to (_tmp62_, (gdouble) _tmp63_, (gdouble) _tmp64_); + _tmp65_ = c; + _tmp66_ = layout; + pango_cairo_show_layout (_tmp65_, _tmp66_); + _tmp67_ = self->priv->use_number_border; + if (_tmp67_) { + cairo_t* _tmp68_ = NULL; cairo_t* _tmp69_ = NULL; cairo_t* _tmp70_ = NULL; - cairo_t* _tmp71_ = NULL; + gdouble _tmp71_ = 0.0; gdouble _tmp72_ = 0.0; gdouble _tmp73_ = 0.0; - gdouble _tmp74_ = 0.0; - cairo_t* _tmp75_ = NULL; - PangoLayout* _tmp76_ = NULL; + cairo_t* _tmp74_ = NULL; + PangoLayout* _tmp75_ = NULL; + cairo_t* _tmp76_ = NULL; cairo_t* _tmp77_ = NULL; - cairo_t* _tmp78_ = NULL; + _tmp68_ = c; + cairo_save (_tmp68_); _tmp69_ = c; - cairo_save (_tmp69_); + cairo_set_line_width (_tmp69_, 1.0); _tmp70_ = c; - cairo_set_line_width (_tmp70_, 1.0); - _tmp71_ = c; - _tmp72_ = color_outline[0]; - _tmp73_ = color_outline[1]; - _tmp74_ = color_outline[2]; - cairo_set_source_rgb (_tmp71_, _tmp72_, _tmp73_, _tmp74_); - _tmp75_ = c; - _tmp76_ = layout; - pango_cairo_layout_path (_tmp75_, _tmp76_); + _tmp71_ = color_outline[0]; + _tmp72_ = color_outline[1]; + _tmp73_ = color_outline[2]; + cairo_set_source_rgb (_tmp70_, _tmp71_, _tmp72_, _tmp73_); + _tmp74_ = c; + _tmp75_ = layout; + pango_cairo_layout_path (_tmp74_, _tmp75_); + _tmp76_ = c; + cairo_stroke_preserve (_tmp76_); _tmp77_ = c; - cairo_stroke_preserve (_tmp77_); - _tmp78_ = c; - cairo_restore (_tmp78_); - } - _tmp79_ = surface; - _tmp80_ = cairo_pattern_create_for_surface (_tmp79_); - pattern = _tmp80_; + cairo_restore (_tmp77_); + } + _tmp78_ = surface; + _tmp79_ = cairo_pattern_create_for_surface (_tmp78_); + pattern = _tmp79_; cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); result = pattern; _cairo_destroy0 (c); @@ -1329,7 +1310,7 @@ _pango_attribute_destroy0 (font_attribute); __vala_PangoFontDescription_free0 (font_desc); _pango_attribute_destroy0 (color_attribute); - __vala_PangoAttrList_free0 (attributes); + _pango_attr_list_unref0 (attributes); _g_object_unref0 (layout); return result; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-mines-3.10.0/src/minefield.c new/gnome-mines-3.10.1/src/minefield.c --- old/gnome-mines-3.10.0/src/minefield.c 2013-09-24 00:05:55.000000000 +0200 +++ new/gnome-mines-3.10.1/src/minefield.c 2013-10-12 13:22:19.000000000 +0200 @@ -1,4 +1,4 @@ -/* minefield.c generated by valac 0.21.1.1-0d6f, the Vala compiler +/* minefield.c generated by valac 0.22.0, the Vala compiler * generated from minefield.vala, do not modify */ /* -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org