filechooserbutton: Duh, remove all the timeouts after tests

[~andy/gtk] / gtk / gtkprinteroption.c

diff --git a/gtk/gtkprinteroption.c b/gtk/gtkprinteroption.c
index c2ba064f20c4e540e6c6a26547761680dbd37bda..644fe209dc2f2f82f41638e874646ff491fb80e7 100644 (file)
--- a/gtk/gtkprinteroption.c
+++ b/gtk/gtkprinteroption.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -178,8 +176,7 @@ gtk_printer_option_set (GtkPrinterOption *option,
     return;
 
   if ((option->type == GTK_PRINTER_OPTION_TYPE_PICKONE ||
-       option->type == GTK_PRINTER_OPTION_TYPE_ALTERNATIVE) &&
-      value != NULL)
+       option->type == GTK_PRINTER_OPTION_TYPE_ALTERNATIVE))
     {
       int i;
       
@@ -195,7 +192,7 @@ gtk_printer_option_set (GtkPrinterOption *option,
       if (i == option->num_choices)
        return; /* Not found in available choices */
     }
-  
+          
   g_free (option->value);
   option->value = g_strdup (value);