Author: jsmeix Date: Fri Sep 19 13:14:19 2008 New Revision: 51312 URL: http://svn.opensuse.org/viewcvs/yast?rev=51312&view=rev Log: Replaced something_has_changed by printing_via_network_has_changed to avoid errors about redefined variables from 'ycpc -qE -M. -I. src/*.ycp' Modified: trunk/printer/src/printingvianetwork.ycp Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.ycp?rev=51312&r1=51311&r2=51312&view=diff ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Fri Sep 19 13:14:19 2008 @@ -137,7 +137,7 @@ `VStretch() ); -boolean something_has_changed = false; +boolean printing_via_network_has_changed = false; any initial_radio_button = nil; any initial_browse_allow = nil; string initial_browse_allow_input_value = ""; @@ -291,7 +291,7 @@ } boolean ApplyNetworkPrintingSettings() -{ something_has_changed = false; +{ printing_via_network_has_changed = false; // Get the actual settings and values from the dialog: any current_radio_button = UI::QueryWidget( `id(`browsing_or_client_only_check_boxes), `CurrentButton ); any current_browse_allow = UI::QueryWidget( `id(`browse_allow_combo_box), `Value ); @@ -307,7 +307,7 @@ if( `browsing_on_radio_button == initial_radio_button ) { // It was initially a "Get browsing info" config, // but now the user has activated the "No browsing info" radio button: - something_has_changed = true; + printing_via_network_has_changed = true; // Do not change the global "Browsing On/Off" entry in cupsd.conf // because "Browsing Off" disables also sharing of local printers // which might be needed by the "Share Printers" dialog. @@ -355,7 +355,7 @@ // the user may have only activated the "No browsing info" radio button // but left the server name value for client-only unchanged: if( current_server_name_input_value != initial_server_name_input_value ) - { something_has_changed = true; + { printing_via_network_has_changed = true; // The user has changed the server name value for client-only // and afterwards he activated the "No browsing info" radio button. // This should result a client-only setup with the new server name @@ -399,7 +399,7 @@ { if( `browsing_off_radio_button == initial_radio_button ) { // It was initially a "No browsing info" config, // but now the user has activated the "Get browsing info" radio button: - something_has_changed = true; + printing_via_network_has_changed = true; } if( `browsing_on_radio_button == initial_radio_button ) { // It was initially a "Get browsing info" config, @@ -407,7 +407,7 @@ if( current_browse_allow != initial_browse_allow || current_browse_allow_input_value != initial_browse_allow_input_value ) - { something_has_changed = true; + { printing_via_network_has_changed = true; } } if( `client_only_radio_button == initial_radio_button ) @@ -433,9 +433,9 @@ ); return false; } - something_has_changed = true; + printing_via_network_has_changed = true; } - if( ! something_has_changed ) + if( ! printing_via_network_has_changed ) { // Nothing has changed: return true; } @@ -466,7 +466,7 @@ // and now the user has activated the "Get browsing info" radio button // but with effectively an empty or "none" browse_allow_value string // so that it is still a "No browsing info" config: - something_has_changed = false; + printing_via_network_has_changed = false; return true; } // Set the browse_allow_value explicitely to "none". @@ -527,7 +527,7 @@ if( "" == server_name || "none" == server_name ) - { something_has_changed = true; + { printing_via_network_has_changed = true; // The client-only server name is the empty string or to 'none'. // This should disable the client-only setup in any case // but no local cupsd is started here because the selected config @@ -557,7 +557,7 @@ // If the server name is not "localhost" and not "127.0.0.1", // a real client-only config is to be set up and then // a possibly running local cupsd will be stopped. - something_has_changed = true; + printing_via_network_has_changed = true; if( server_name != "localhost" && substring( server_name, 0, 5 ) != "127.0" ) @@ -577,10 +577,10 @@ // the user may have now entered "localhost" or "127.0.0.1" // which makes it effectively a config with a local running cupsd. if( current_server_name_input_value != initial_server_name_input_value ) - { something_has_changed = true; + { printing_via_network_has_changed = true; } } - if( ! something_has_changed ) + if( ! printing_via_network_has_changed ) { // Nothing has changed: return true; } @@ -768,7 +768,7 @@ _("Failed to apply the settings to the system.") ); } - if( ! something_has_changed ) + if( ! printing_via_network_has_changed ) { y2milestone( "Nothing changed in 'Printing via Network' dialog." ); Popup::ShowFeedback( // No title for such a simple feedback message: "", -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org