Attachment #81297 for bug #56533

View | Details | Raw Unified | Return to bug 56533
Collapse All | Expand All

Lines 2111-2117 Link Here

(-)src/starchart.c.old (-2 / +2 lines)
2111	/*******************/	2111	/*******************/
2112	/* Planets signals */	2112	/* Planets signals */
2113	/*******************/	2113	/*******************/
2114	static void planet_conn (gpointer key, gpointer value, gpointer data) {	2114	void planet_conn (gpointer key, gpointer value, gpointer data) {
2115	g_signal_connect (GWP_PLANET(value),	2115	g_signal_connect (GWP_PLANET(value),
2116	"property-changed",	2116	"property-changed",
2117	G_CALLBACK(update_planet_notification),	2117	G_CALLBACK(update_planet_notification),
Lines 3199-3205 Link Here
3199	gdouble wx, wy;	3199	gdouble wx, wy;
3200	gdouble ax, ay, bx, by, zoom;	3200	gdouble ax, ay, bx, by, zoom;
3201		3201
3202	static void add_item (gpointer key, gpointer value, gpointer user_data) {	3202	void add_item (gpointer key, gpointer value, gpointer user_data) {
3203	/* GSList p_list = (GSList )user_data; */	3203	/* GSList p_list = (GSList )user_data; */
3204	planets = g_slist_append (planets, value);	3204	planets = g_slist_append (planets, value);
3205	}	3205	}




{
  PyObject *ret = PyDict_New();

  void add_ship (gpointer key, gpointer value, gpointer user_data) {
    PyObject *dict = (PyObject *)user_data;
    GwpShip *ship = GWP_SHIP(value);


{
  PyObject *ret = PyDict_New();

  void add_planet (gpointer key, gpointer value, gpointer user_data) {
    PyObject *dict = (PyObject *)user_data;
    GwpPlanet *planet = GWP_PLANET(value);


{
  PyObject *ret = PyDict_New();

  void add_hullspec (gpointer value, gpointer user_data) {
    PyObject *dict = (PyObject *)user_data;
    GwpHullSpec *hullspec = GWP_HULLSPEC(value);


{
  PyObject *ret = PyDict_New();

  void add_engspec (gpointer value, gpointer user_data) {
    PyObject *dict = (PyObject *)user_data;
    GwpEngSpec *engspec = GWP_ENGSPEC(value);


{
  PyObject *ret = PyDict_New();

  void add_beamspec (gpointer value, gpointer user_data) {
    PyObject *dict = (PyObject *)user_data;
    GwpBeamSpec *beamspec = GWP_BEAMSPEC(value);


{
  PyObject *ret = PyDict_New();

  void add_torpspec (gpointer value, gpointer user_data) {
    PyObject *dict = (PyObject *)user_data;
    GwpTorpSpec *torpspec = GWP_TORPSPEC(value);


Lines 2692-2698 Link Here

(-)src/vcr.c.old (-1 lines)
2692	{	2692	{
2693	gchar *name;	2693	gchar *name;
2694	gint *idlist;	2694	gint *idlist;
2695	static void foreach_func( gpointer key, gpointer value, gpointer user_data );
2696		2695
2697	/* test if list is already populated */	2696	/* test if list is already populated */
2698	idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");	2697	idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");

Return to bug 56533

Lines 749-755 Link Here

(-)src/gwp-game-state.c.old (-2 / +2 lines)
749	/* Connect to interesting signals */	749	/* Connect to interesting signals */
750	/**********************************/	750	/**********************************/
751	/* Selected planets */	751	/* Selected planets */
752	static void planet_conn (gpointer key, gpointer value, gpointer self) {	752	void planet_conn (gpointer key, gpointer value, gpointer self) {
753	g_signal_connect (GWP_PLANET(value),	753	g_signal_connect (GWP_PLANET(value),
754	"selected",	754	"selected",
755	G_CALLBACK(selected_planet_notification),	755	G_CALLBACK(selected_planet_notification),
Lines 757-763 Link Here
757	}	757	}
758	g_hash_table_foreach (planet_list, (GHFunc) planet_conn, self);	758	g_hash_table_foreach (planet_list, (GHFunc) planet_conn, self);
759	/* Selected ships */	759	/* Selected ships */
760	static void ship_conn (gpointer key, gpointer value, gpointer self) {	760	void ship_conn (gpointer key, gpointer value, gpointer self) {
761	g_signal_connect (GWP_SHIP(value),	761	g_signal_connect (GWP_SHIP(value),
762	"selected",	762	"selected",
763	G_CALLBACK(selected_ship_notification),	763	G_CALLBACK(selected_ship_notification),

Lines 2590-2596 Link Here

(-)src/vp_utils.c.old (-2 / +2 lines)
2590	gwp_planet_set_colonists (planet, atoi(p_clans));	2590	gwp_planet_set_colonists (planet, atoi(p_clans));
2591		2591
2592	/* Compare func */	2592	/* Compare func */
2593	static gint compare_race (gconstpointer race, gconstpointer adj) {	2593	gint compare_race (gconstpointer race, gconstpointer adj) {
2594	gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));	2594	gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
2595	if (strncmp(race_str, adj, strlen(adj)) == 0)	2595	if (strncmp(race_str, adj, strlen(adj)) == 0)
2596	return 0;	2596	return 0;
Lines 2639-2645 Link Here
2639	/* Assign known planet values */	2639	/* Assign known planet values */
2640	gwp_planet_set_is_known (planet, TRUE);	2640	gwp_planet_set_is_known (planet, TRUE);
2641	/* Compare func */	2641	/* Compare func */
2642	static gint compare_race (gconstpointer race, gconstpointer adj) {	2642	gint compare_race (gconstpointer race, gconstpointer adj) {
2643	gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));	2643	gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
2644	if (strncmp(race_str, adj, strlen(adj)) == 0)	2644	if (strncmp(race_str, adj, strlen(adj)) == 0)
2645	return 0;	2645	return 0;

Lines 8657-8663 Link Here

(-)src/gwp-py-mappings.c.old (-6 / +6 lines)
8657	{	8657	{
8658	PyObject *ret = PyDict_New();	8658	PyObject *ret = PyDict_New();
8659		8659
8660	static void add_ship (gpointer key, gpointer value, gpointer user_data) {	8660	void add_ship (gpointer key, gpointer value, gpointer user_data) {
8661	PyObject dict = (PyObject )user_data;	8661	PyObject dict = (PyObject )user_data;
8662	GwpShip *ship = GWP_SHIP(value);	8662	GwpShip *ship = GWP_SHIP(value);
8663		8663
Lines 8679-8685 Link Here
8679	{	8679	{
8680	PyObject *ret = PyDict_New();	8680	PyObject *ret = PyDict_New();
8681		8681
8682	static void add_planet (gpointer key, gpointer value, gpointer user_data) {	8682	void add_planet (gpointer key, gpointer value, gpointer user_data) {
8683	PyObject dict = (PyObject )user_data;	8683	PyObject dict = (PyObject )user_data;
8684	GwpPlanet *planet = GWP_PLANET(value);	8684	GwpPlanet *planet = GWP_PLANET(value);
8685		8685
Lines 8701-8707 Link Here
8701	{	8701	{
8702	PyObject *ret = PyDict_New();	8702	PyObject *ret = PyDict_New();
8703		8703
8704	static void add_hullspec (gpointer value, gpointer user_data) {	8704	void add_hullspec (gpointer value, gpointer user_data) {
8705	PyObject dict = (PyObject )user_data;	8705	PyObject dict = (PyObject )user_data;
8706	GwpHullSpec *hullspec = GWP_HULLSPEC(value);	8706	GwpHullSpec *hullspec = GWP_HULLSPEC(value);
8707		8707
Lines 8723-8729 Link Here
8723	{	8723	{
8724	PyObject *ret = PyDict_New();	8724	PyObject *ret = PyDict_New();
8725		8725
8726	static void add_engspec (gpointer value, gpointer user_data) {	8726	void add_engspec (gpointer value, gpointer user_data) {
8727	PyObject dict = (PyObject )user_data;	8727	PyObject dict = (PyObject )user_data;
8728	GwpEngSpec *engspec = GWP_ENGSPEC(value);	8728	GwpEngSpec *engspec = GWP_ENGSPEC(value);
8729		8729
Lines 8745-8751 Link Here
8745	{	8745	{
8746	PyObject *ret = PyDict_New();	8746	PyObject *ret = PyDict_New();
8747		8747
8748	static void add_beamspec (gpointer value, gpointer user_data) {	8748	void add_beamspec (gpointer value, gpointer user_data) {
8749	PyObject dict = (PyObject )user_data;	8749	PyObject dict = (PyObject )user_data;
8750	GwpBeamSpec *beamspec = GWP_BEAMSPEC(value);	8750	GwpBeamSpec *beamspec = GWP_BEAMSPEC(value);
8751		8751
Lines 8767-8773 Link Here
8767	{	8767	{
8768	PyObject *ret = PyDict_New();	8768	PyObject *ret = PyDict_New();
8769		8769
8770	static void add_torpspec (gpointer value, gpointer user_data) {	8770	void add_torpspec (gpointer value, gpointer user_data) {
8771	PyObject dict = (PyObject )user_data;	8771	PyObject dict = (PyObject )user_data;
8772	GwpTorpSpec *torpspec = GWP_TORPSPEC(value);	8772	GwpTorpSpec *torpspec = GWP_TORPSPEC(value);
8773		8773