[pkg-ggz-commits] r284 - in trunk/ggz-gtk-client/debian: . patches

[petere at alioth.debian.org]

Author: petere
Date: 2008-02-02 13:27:04 +0000 (Sat, 02 Feb 2008)
New Revision: 284

Added:
   trunk/ggz-gtk-client/debian/patches/login.patch
Modified:
   trunk/ggz-gtk-client/debian/changelog
Log:
* Added login.patch from gnome-games (closes: #417977)

Modified: trunk/ggz-gtk-client/debian/changelog
===================================================================
--- trunk/ggz-gtk-client/debian/changelog	2008-02-02 13:23:38 UTC (rev 283)
+++ trunk/ggz-gtk-client/debian/changelog	2008-02-02 13:27:04 UTC (rev 284)
@@ -6,6 +6,7 @@
 
   [ Peter Eisentraut ]
   * Updates standards version
+  * Added login.patch from gnome-games (closes: #417977)
 
  -- Peter Eisentraut <petere at debian.org>  Sat, 02 Feb 2008 14:21:09 +0100
 

Added: trunk/ggz-gtk-client/debian/patches/login.patch
===================================================================
--- trunk/ggz-gtk-client/debian/patches/login.patch	                        (rev 0)
+++ trunk/ggz-gtk-client/debian/patches/login.patch	2008-02-02 13:27:04 UTC (rev 284)
@@ -0,0 +1,55 @@
+--- ggz-gtk-client-0.0.14/ggz-gtk/login.c	2007-01-16 19:51:03.000000000 +0100
++++ gnome-games-2.18.0.1/dependencies/ggz-gtk/login.c	2007-03-20 21:20:11.000000000 +0100
+@@ -2,7 +2,7 @@
+  * File: login.c
+  * Author: Justin Zaun
+  * Project: GGZ GTK Client
+- * $Id: login.c 8564 2006-08-31 19:05:43Z jdorje $
++ * $Id: login.c 5856 2007-01-13 20:00:19Z andreasr $
+  *
+  * This is the main program body for the GGZ client
+  *
+@@ -597,7 +597,7 @@
+ 	gtk_entry_set_max_length(GTK_ENTRY(host_entry), 256);
+ 	gtk_box_pack_start(GTK_BOX(server_box), host_entry, FALSE, FALSE,
+ 			   5);
+-	gtk_entry_set_text(GTK_ENTRY(host_entry), _("localhost"));
++	gtk_entry_set_text(GTK_ENTRY(host_entry), "localhost");
+ 
+ 	port_label = gtk_label_new(_("Port:"));
+ 	gtk_box_pack_start(GTK_BOX(server_box), port_label, FALSE, TRUE,
+@@ -609,7 +609,7 @@
+ 	gtk_entry_set_max_length(GTK_ENTRY(port_entry), 5);
+ 	gtk_box_pack_start(GTK_BOX(server_box), port_entry, FALSE, FALSE,
+ 			   0);
+-	gtk_entry_set_text(GTK_ENTRY(port_entry), _("5688"));
++	gtk_entry_set_text(GTK_ENTRY(port_entry), "5688");
+ 
+ 	msg_label = gtk_label_new("");
+ 	g_object_set_data(G_OBJECT(dlg_login), "msg_label", msg_label);
+@@ -707,12 +707,6 @@
+ 			   TRUE, 0);
+ 	gtk_container_set_border_width(GTK_CONTAINER(hbuttonbox), 5);
+ 
+-	connect_button = stockbutton_new(GTK_STOCK_JUMP_TO, _("Connect"));
+-	g_object_set_data(G_OBJECT(dlg_login),
+-			  "connect_button", connect_button);
+-	gtk_container_add(GTK_CONTAINER(hbuttonbox), connect_button);
+-	GTK_WIDGET_SET_FLAGS(connect_button, GTK_CAN_DEFAULT);
+-
+ 	if (ggz_closed_cb) {
+ 		cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ 	} else {
+@@ -721,6 +715,12 @@
+ 	gtk_container_add(GTK_CONTAINER(hbuttonbox), cancel_button);
+ 	GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
+ 
++	connect_button = stockbutton_new(GTK_STOCK_JUMP_TO, _("Connect"));
++	g_object_set_data(G_OBJECT(dlg_login),
++			  "connect_button", connect_button);
++	gtk_container_add(GTK_CONTAINER(hbuttonbox), connect_button);
++	GTK_WIDGET_SET_FLAGS(connect_button, GTK_CAN_DEFAULT);
++
+ 	g_signal_connect(GTK_OBJECT(dlg_login), "realize",
+ 			 GTK_SIGNAL_FUNC(login_fill_defaults),
+ 			 ggz_strdup(default_profile));