[Freeciv-commits] r27960 - in /branches/S2_5/client: gui-gtk-2.0/citydlg.c gui-gtk-3.0/citydlg.c

[cazfi74]

Author: cazfi
Date: Wed Feb  4 04:03:18 2015
New Revision: 27960

URL: http://svn.gna.org/viewcvs/freeciv?rev=27960&view=rev
Log:
Removed unused change_shell field from gtk-clients' citydlg.

See patch #5775

Modified:
    branches/S2_5/client/gui-gtk-2.0/citydlg.c
    branches/S2_5/client/gui-gtk-3.0/citydlg.c

Modified: branches/S2_5/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/citydlg.c?rev=27960&r1=27959&r2=27960&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-2.0/citydlg.c  (original)
+++ branches/S2_5/client/gui-gtk-2.0/citydlg.c  Wed Feb  4 04:03:18 2015
@@ -181,7 +181,6 @@
   } misc;
 
   GtkWidget *buy_shell, *sell_shell;
-  GtkWidget *change_shell;
   GtkTreeSelection *change_selection;
   GtkWidget *rename_shell, *rename_input;
 
@@ -1275,7 +1274,6 @@
 
   pdialog = fc_malloc(sizeof(struct city_dialog));
   pdialog->pcity = pcity;
-  pdialog->change_shell = NULL;
   pdialog->buy_shell = NULL;
   pdialog->sell_shell = NULL;
   pdialog->rename_shell = NULL;
@@ -2903,12 +2901,15 @@
   unit_node_vector_free(&pdialog->overview.supported_units);
   unit_node_vector_free(&pdialog->overview.present_units);
 
-  if (pdialog->buy_shell)
+  if (pdialog->buy_shell) {
     gtk_widget_destroy(pdialog->buy_shell);
-  if (pdialog->sell_shell)
+  }
+  if (pdialog->sell_shell) {
     gtk_widget_destroy(pdialog->sell_shell);
-  if (pdialog->rename_shell)
+  }
+  if (pdialog->rename_shell) {
     gtk_widget_destroy(pdialog->rename_shell);
+  }
 
   g_object_unref(pdialog->map_canvas_store);
   if (pdialog->map_pixbuf_unscaled) {

Modified: branches/S2_5/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/citydlg.c?rev=27960&r1=27959&r2=27960&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/citydlg.c  (original)
+++ branches/S2_5/client/gui-gtk-3.0/citydlg.c  Wed Feb  4 04:03:18 2015
@@ -180,7 +180,6 @@
   } misc;
 
   GtkWidget *buy_shell, *sell_shell;
-  GtkWidget *change_shell;
   GtkTreeSelection *change_selection;
   GtkWidget *rename_shell, *rename_input;
 
@@ -1330,7 +1329,6 @@
 
   pdialog = fc_malloc(sizeof(struct city_dialog));
   pdialog->pcity = pcity;
-  pdialog->change_shell = NULL;
   pdialog->buy_shell = NULL;
   pdialog->sell_shell = NULL;
   pdialog->rename_shell = NULL;
@@ -2954,12 +2952,15 @@
   unit_node_vector_free(&pdialog->overview.supported_units);
   unit_node_vector_free(&pdialog->overview.present_units);
 
-  if (pdialog->buy_shell)
+  if (pdialog->buy_shell) {
     gtk_widget_destroy(pdialog->buy_shell);
-  if (pdialog->sell_shell)
+  }
+  if (pdialog->sell_shell) {
     gtk_widget_destroy(pdialog->sell_shell);
-  if (pdialog->rename_shell)
+  }
+  if (pdialog->rename_shell) {
     gtk_widget_destroy(pdialog->rename_shell);
+  }
 
   cairo_surface_destroy(pdialog->map_canvas_store_unscaled);
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits