Bug#460763: RM: gbatnav -- RoQA; obsolete
Dear all,
I've made a patch for transition this package to gnome2.
Please give me few days to prepare a new package for uploading.
I attached the patch first.
Regards,
Ying-Chun Liu
--
PaulLiu(Ying-Chun Liu)
E-mail address: grandpaul@gmail.com
Index: gbatnav-1.0.4cvs20051004/configure.in
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/configure.in 2008-01-25 16:53:27.860777566 +0800
+++ gbatnav-1.0.4cvs20051004/configure.in 2008-01-25 16:54:59.364432839 +0800
@@ -4,7 +4,7 @@
AM_INIT_AUTOMAKE(gbatnav, 1.0.5pre)
AM_MAINTAINER_MODE
AM_ACLOCAL_INCLUDE(macros)
-GNOME_INIT
+#GNOME_INIT
AC_PROG_CC
AC_PROG_LN_S
@@ -13,9 +13,12 @@
AC_HEADER_STDC
AC_ARG_PROGRAM
-dnl GNOME_COMPILE_WARNINGS
+#dnl GNOME_COMPILE_WARNINGS
-GNOME_X_CHECKS
+#GNOME_X_CHECKS
+PKG_CHECK_MODULES(GNOME,[libgnomeui-2.0])
+AC_SUBST(GNOME_CFLAGS)
+AC_SUBST(GNOME_LIBS)
ALL_LINGUAS="es de pl ja ru fr"
AM_GNU_GETTEXT
@@ -49,11 +52,11 @@
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
-gnome_cv_use_gnome=yes
+#gnome_cv_use_gnome=yes
+#intl/Makefile
AC_OUTPUT([
Makefile
-intl/Makefile
po/Makefile.in
macros/Makefile
common/Makefile
Index: gbatnav-1.0.4cvs20051004/gbnclient/Makefile.am
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/Makefile.am 2008-01-25 16:53:41.361316985 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/Makefile.am 2008-01-25 16:55:17.365151669 +0800
@@ -11,7 +11,8 @@
@GGZMOD_INCLUDES@ \
$(GNOME_INCLUDEDIR) \
-I$(srcdir)/pixmaps \
- -DBINDIR=\"$(bindir)\"
+ -DBINDIR=\"$(bindir)\" \
+ @GNOME_CFLAGS@
bin_PROGRAMS = gbnclient
@@ -44,7 +45,8 @@
@GGZMOD_LDFLAGS@ \
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
- $(INTLLIBS)
+ $(INTLLIBS) \
+ @GNOME_LIBS@
EXTRA_DIST = README AUTHORS \
Index: gbatnav-1.0.4cvs20051004/gbnclient/g_interface.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/g_interface.c 2008-01-25 16:53:49.361636464 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/g_interface.c 2008-01-25 16:55:29.365631022 +0800
@@ -147,19 +147,21 @@
{
GtkWidget *href, *hbox;
static GtkWidget *about = NULL;
+ static GdkPixbuf *gnome_gbatnav=NULL;
static const char *authors[] = {
"Ricardo C. Quesada (riq@core-sdi.com)",
NULL
};
if (!about) {
-
+ gnome_gbatnav = gdk_pixbuf_new_from_file("gnome-gbatnav.png",NULL);
about = gnome_about_new (_("Batalla Naval client"),
VERSION,
_("(C) 1998-2001 Ricardo C. Quesada"),
- (const char**) authors,
_("A multiplayer networked battleship game."),
- "gnome-gbatnav.png");
+ (const char**) authors,
+ NULL, NULL,
+ gnome_gbatnav);
gtk_signal_connect (GTK_OBJECT (about), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
@@ -307,6 +309,8 @@
GtkTooltips *tooltips;
GtkWidget *inputline;
GtkWidget *vbox_buttons;
+ GtkScrolledWindow *scrolledWindow=NULL;
+ GtkTextIter text_iter;
#ifdef ENABLE_NLS
# define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
@@ -376,16 +380,19 @@
/* respecto al drawing_about */
+ scrolledWindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL,NULL));
hbox_text_help = gtk_hbox_new ( FALSE, 0);
gtk_widget_show( hbox_text_help );
- text_help = gtk_text_new(NULL,NULL);
- gtk_box_pack_start( GTK_BOX(hbox_text_help), text_help, FALSE,TRUE,0);
+ text_help = GTK_WIDGET(gtk_text_view_new());
+ gtk_container_add(GTK_CONTAINER(scrolledWindow),text_help);
gtk_widget_show(text_help);
+ gtk_box_pack_start( GTK_BOX(hbox_text_help), GTK_WIDGET(scrolledWindow), TRUE,TRUE,0);
+ gtk_widget_show(GTK_WIDGET(scrolledWindow));
- vscrollbar_help = gtk_vscrollbar_new (GTK_TEXT (text_help)->vadj);
- gtk_box_pack_start( GTK_BOX(hbox_text_help), vscrollbar_help, FALSE,TRUE,0);
- gtk_widget_show (vscrollbar_help);
+ vscrollbar_help = gtk_scrolled_window_get_vscrollbar(scrolledWindow);
+ /*gtk_box_pack_start( GTK_BOX(hbox_text_help), vscrollbar_help, FALSE,TRUE,0);*/
+ /*gtk_widget_show (vscrollbar_help);*/
label_left = gtk_label_new(_("My board"));
gtk_notebook_append_page ( GTK_NOTEBOOK(notebook_left),drawing_left,label_left);
@@ -432,23 +439,28 @@
gtk_widget_show(separator);
+ scrolledWindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL,NULL));
hbox_text = gtk_hbox_new ( FALSE, 0);
gtk_container_add ( GTK_CONTAINER(vbox), hbox_text );
gtk_widget_show( hbox_text );
- text = gtk_text_new(NULL,NULL);
- gtk_box_pack_start( GTK_BOX(hbox_text), text, TRUE,TRUE,0);
+ text = GTK_WIDGET(gtk_text_view_new());
+ gtk_container_add(GTK_CONTAINER(scrolledWindow),text);
gtk_widget_show(text);
-
- vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
+ gtk_box_pack_start( GTK_BOX(hbox_text), GTK_WIDGET(scrolledWindow), TRUE,TRUE,0);
+ gtk_widget_show(GTK_WIDGET(scrolledWindow));
+
+ vscrollbar = gtk_scrolled_window_get_vscrollbar(scrolledWindow);
gtk_range_set_update_policy( GTK_RANGE( vscrollbar ), GTK_UPDATE_CONTINUOUS );
- gtk_box_pack_start( GTK_BOX(hbox_text), vscrollbar, FALSE,TRUE,0);
- gtk_widget_show (vscrollbar);
+ /*gtk_box_pack_start( GTK_BOX(hbox_text), vscrollbar, FALSE,TRUE,0);
+ gtk_widget_show (vscrollbar);*/
- gtk_text_freeze(GTK_TEXT(text));
+ /*gtk_text_freeze(GTK_TEXT(text));*/
gtk_widget_realize(text);
- gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,"Gnome Batalla Naval client v"IPVERSION" by riq (c) 1998-2001" ,-1);
- gtk_text_thaw(GTK_TEXT(text));
+ /*gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,"Gnome Batalla Naval client v"IPVERSION" by riq (c) 1998-2001" ,-1);*/
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter);
+ gtk_text_buffer_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter,"Gnome Batalla Naval client v"IPVERSION" by riq (c) 1998-2001" ,-1);
+ /*gtk_text_thaw(GTK_TEXT(text));*/
inputline = gtk_entry_new();
Index: gbatnav-1.0.4cvs20051004/gbnclient/gbnclient.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/gbnclient.c 2008-01-25 16:53:58.862016009 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/gbnclient.c 2008-01-25 16:55:42.866170181 +0800
@@ -111,9 +111,10 @@
/* Quick Help tab */
void bn_help( void )
{
- gtk_text_freeze(GTK_TEXT(text_help));
+ GtkTextIter text_help_iter;
+ /*gtk_text_freeze(GTK_TEXT(text_help));*/
gtk_widget_realize(text_help);
- gtk_text_insert( GTK_TEXT(text_help),NULL,NULL,NULL
+ /*gtk_text_insert( GTK_TEXT(text_help),NULL,NULL,NULL
,_("Batnav Quick Help -\n"
"Use this to hide your ships\n"
"Fill the board with:\n"
@@ -126,8 +127,22 @@
"Send bugs,comments, etc to:\n"
" riq@core-sdi.com\n"
) ,-1 );
-
- gtk_text_thaw(GTK_TEXT(text_help));
+ */
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_help)),&text_help_iter);
+ gtk_text_buffer_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_help)),&text_help_iter
+ ,_("Batnav Quick Help -\n"
+ "Use this to hide your ships\n"
+ "Fill the board with:\n"
+ " 4 ships of 1 unit\n"
+ " 3 ships of 2 units\n"
+ " 2 ships of 3 units\n"
+ " 1 ship of 4 units\n"
+ " or press 'Random'\n"
+ "Then press 'Send ships' and 'Start'\n"
+ "Send bugs,comments, etc to:\n"
+ " riq@core-sdi.com\n"
+ ) ,-1 );
+ /*gtk_text_thaw(GTK_TEXT(text_help));*/
}
/****************************************************************************
Index: gbatnav-1.0.4cvs20051004/gbnclient/pantalla.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/pantalla.c 2008-01-25 16:54:05.362275687 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/pantalla.c 2008-01-25 16:55:54.866649402 +0800
@@ -174,6 +174,7 @@
gchar messg2[200];
gfloat new_value ;
gint h,w;
+ GtkTextIter text_iter;
va_list args;
@@ -185,12 +186,16 @@
strncat(messg,messg2,200);
va_end( args );
- gtk_text_freeze(GTK_TEXT(text));
+ /*gtk_text_freeze(GTK_TEXT(text));*/
gtk_widget_realize(text);
- gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,messg,-1);
- gtk_text_thaw(GTK_TEXT(text));
+ /*gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,messg,-1);*/
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter);
+ gtk_text_buffer_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter,messg,-1);
+ /*gtk_text_thaw(GTK_TEXT(text));*/
- gdk_window_get_size( GTK_TEXT( text )->text_area, &w, &h );
+ /*gdk_window_get_size( GTK_TEXT( text )->text_area, &w, &h );*/
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter);
+ gtk_text_view_get_line_yrange( GTK_TEXT_VIEW(text), &text_iter,&w,&h);
if( GTK_RANGE( vscrollbar )->adjustment->upper >= h ) {
new_value = GTK_RANGE( vscrollbar )-> adjustment->upper - h;
Index: gbatnav-1.0.4cvs20051004/gbnrobot/Makefile.am
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnrobot/Makefile.am 2008-01-25 16:54:15.362675170 +0800
+++ gbatnav-1.0.4cvs20051004/gbnrobot/Makefile.am 2008-01-25 16:56:16.367509479 +0800
@@ -9,7 +9,8 @@
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DPIXMAPDIR=\"$(datadir)/pixmaps/\" \
-I$(includedir) \
- $(GNOME_INCLUDEDIR)
+ $(GNOME_INCLUDEDIR) \
+ @GNOME_CFLAGS@
bin_PROGRAMS = gbnrobot
@@ -27,7 +28,8 @@
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
@GGZMOD_LDFLAGS@ \
- $(INTLLIBS)
+ $(INTLLIBS) \
+ @GNOME_LIBS@
appicon_DATA = gbnrobot.png
Index: gbatnav-1.0.4cvs20051004/gbnserver/Makefile.am
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnserver/Makefile.am 2008-01-25 16:54:23.362994784 +0800
+++ gbatnav-1.0.4cvs20051004/gbnserver/Makefile.am 2008-01-25 16:56:31.368111326 +0800
@@ -11,7 +11,8 @@
$(GNOME_INCLUDEDIR) \
@GGZDMOD_INCLUDES@ \
-I$(srcdir)/../gbnclient/pixmaps \
- -DBINDIR=\"$(bindir)\"
+ -DBINDIR=\"$(bindir)\" \
+ @GNOME_CFLAGS@
bin_PROGRAMS = gbnserver
@@ -36,7 +37,8 @@
@GGZDMOD_LDFLAGS@ \
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
- $(INTLLIBS)
+ $(INTLLIBS) \
+ @GNOME_LIBS@
EXTRA_DIST = README AUTHORS index.html gbnserver.desktop gbatnav-topic.dat gnome-gbatnavd.png index.html
Index: gbatnav-1.0.4cvs20051004/gbnserver/g_interface.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnserver/g_interface.c 2008-01-25 16:54:28.863214460 +0800
+++ gbatnav-1.0.4cvs20051004/gbnserver/g_interface.c 2008-01-25 16:56:43.368592646 +0800
@@ -49,17 +49,24 @@
static void about(GtkWidget *widget, gpointer data)
{
GtkWidget *about;
+ GdkPixbuf *gnome_gbatnav=NULL;
gchar *authors[] = {
"riq (riq@core-sdi.com)",
NULL
};
+ gnome_gbatnav = gdk_pixbuf_new_from_file("gnome-gbatnav.png",NULL);
about = gnome_about_new (_("Batalla Naval server"), VERSION,
"(C) 1998-2001 Ricardo C. Quesada",
- (const char**) authors,
_("A multiplayer, multirobot, networked battleship game"),
- "gnome-gbatnav.png");
+ (const char**) authors,
+ NULL, NULL,
+ gnome_gbatnav);
gtk_widget_show (about);
+ if (gnome_gbatnav !=NULL) {
+ g_object_unref(gnome_gbatnav);
+ gnome_gbatnav=NULL;
+ }
}
GnomeUIInfo gamemenu[] =
@@ -163,7 +170,8 @@
gtk_clist_append (GTK_CLIST (clist), clist_texts);
}
- boton = gnome_stock_button(GNOME_STOCK_BUTTON_OK);
+ /*boton = gnome_stock_button(GNOME_STOCK_BUTTON_OK);*/
+ boton = GTK_WIDGET(gtk_button_new_from_stock(GTK_STOCK_OK));
gtk_box_pack_start( GTK_BOX( clist_box), boton, TRUE, TRUE, 0);
gtk_widget_show_all (window);
Index: gbatnav-1.0.4cvs20051004/gbnserver/play.h
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnserver/play.h 2008-01-25 16:54:37.363554003 +0800
+++ gbatnav-1.0.4cvs20051004/gbnserver/play.h 2008-01-25 16:56:54.369033967 +0800
@@ -1,6 +1,7 @@
/* $Id: play.h,v 1.1.1.1 2000/02/13 00:56:49 riq Exp $ */
#ifndef __BN_PLAY_H__
# define __BN_PLAY_H__
+#include <gdk/gdk.h>
void play_batnav( gpointer , gint , GdkInputCondition );
gint quejugador( gint );
Reply to: