Index: gtk/gtkwidget.c =================================================================== --- gtk/gtkwidget.c (revision 17428) +++ gtk/gtkwidget.c (working copy) @@ -7238,8 +7238,7 @@ g_object_unref (widget->style); widget->style = NULL; - if (widget->name) - g_free (widget->name); + g_free (widget->name); aux_info =_gtk_widget_get_aux_info (widget, FALSE); if (aux_info) Index: gtk/gtktreemodelfilter.c =================================================================== --- gtk/gtktreemodelfilter.c (revision 17428) +++ gtk/gtktreemodelfilter.c (working copy) @@ -375,8 +375,7 @@ if (filter->priv->root) gtk_tree_model_filter_free_level (filter, filter->priv->root); - if (filter->priv->modify_types) - g_free (filter->priv->modify_types); + g_free (filter->priv->modify_types); if (filter->priv->modify_destroy) filter->priv->modify_destroy (filter->priv->modify_data); Index: gtk/gtkpathbar.c =================================================================== --- gtk/gtkpathbar.c (revision 17428) +++ gtk/gtkpathbar.c (working copy) @@ -1144,8 +1144,7 @@ gtk_file_path_free (button_data->path); button_data->path = NULL; - if (button_data->dir_name) - g_free (button_data->dir_name); + g_free (button_data->dir_name); button_data->dir_name = NULL; button_data->button = NULL; Index: gtk/gtktextiter.c =================================================================== --- gtk/gtktextiter.c (revision 17428) +++ gtk/gtktextiter.c (working copy) @@ -1325,8 +1325,7 @@ /* No tags, use default style */ if (tags == NULL || tag_count == 0) { - if (tags) - g_free (tags); + g_free (tags); return NULL; } @@ -1743,8 +1742,7 @@ /* No tags, use default style */ if (tags == NULL || tag_count == 0) { - if (tags) - g_free (tags); + g_free (tags); return FALSE; } Index: gtk/updateiconcache.c =================================================================== --- gtk/updateiconcache.c (revision 17428) +++ gtk/updateiconcache.c (working copy) @@ -523,8 +523,7 @@ image->image_data = idata; - if (path2) - g_free (path2); + g_free (path2); } } @@ -572,8 +571,7 @@ image->icon_data = idata; - if (path2) - g_free (path2); + g_free (path2); } } Index: gtk/gtktextbuffer.c =================================================================== --- gtk/gtktextbuffer.c (revision 17428) +++ gtk/gtktextbuffer.c (working copy) @@ -4318,8 +4318,7 @@ } /* Not in cache; open up the first cache entry */ - if (cache->entries[ATTR_CACHE_SIZE-1].attrs) - g_free (cache->entries[ATTR_CACHE_SIZE-1].attrs); + g_free (cache->entries[ATTR_CACHE_SIZE-1].attrs); g_memmove (cache->entries + 1, cache->entries, sizeof (CacheEntry) * (ATTR_CACHE_SIZE - 1)); Index: gtk/gtkcellrendererpixbuf.c =================================================================== --- gtk/gtkcellrendererpixbuf.c (revision 17428) +++ gtk/gtkcellrendererpixbuf.c (working copy) @@ -336,8 +336,7 @@ priv->stock_size = g_value_get_uint (value); break; case PROP_STOCK_DETAIL: - if (priv->stock_detail) - g_free (priv->stock_detail); + g_free (priv->stock_detail); priv->stock_detail = g_value_dup_string (value); break; case PROP_ICON_NAME: Index: gtk/gtkaboutdialog.c =================================================================== --- gtk/gtkaboutdialog.c (revision 17428) +++ gtk/gtkaboutdialog.c (working copy) @@ -808,9 +808,7 @@ priv = (GtkAboutDialogPrivate *)about->private_data; - tmp = priv->version; - priv->version = version ? g_strdup (version) : NULL; - g_free (tmp); + g_free (priv->version); update_name_version (about); @@ -861,9 +859,7 @@ priv = (GtkAboutDialogPrivate *)about->private_data; - tmp = priv->copyright; - priv->copyright = copyright ? g_strdup (copyright) : NULL; - g_free (tmp); + g_free (priv->copyright); if (priv->copyright != NULL) { Index: gtk/gtkcurve.c =================================================================== --- gtk/gtkcurve.c (revision 17428) +++ gtk/gtkcurve.c (working copy) @@ -350,8 +350,7 @@ if (c->num_points != width) { c->num_points = width; - if (c->point) - g_free (c->point); + g_free (c->point); c->point = g_malloc (c->num_points * sizeof (c->point[0])); } @@ -687,8 +686,7 @@ } else if (c->curve_type == GTK_CURVE_TYPE_FREE) { - if (c->ctlpoint) - g_free (c->ctlpoint); + g_free (c->ctlpoint); c->num_ctlpoints = 9; c->ctlpoint = g_malloc (c->num_ctlpoints * sizeof (*c->ctlpoint)); @@ -746,8 +744,7 @@ static void gtk_curve_reset_vector (GtkCurve *curve) { - if (curve->ctlpoint) - g_free (curve->ctlpoint); + g_free (curve->ctlpoint); curve->num_ctlpoints = 2; curve->ctlpoint = g_malloc (2 * sizeof (curve->ctlpoint[0])); @@ -1030,10 +1027,8 @@ curve = GTK_CURVE (object); if (curve->pixmap) g_object_unref (curve->pixmap); - if (curve->point) - g_free (curve->point); - if (curve->ctlpoint) - g_free (curve->ctlpoint); + g_free (curve->point); + g_free (curve->ctlpoint); G_OBJECT_CLASS (parent_class)->finalize (object); } Index: gtk/gtktextlayout.c =================================================================== --- gtk/gtktextlayout.c (revision 17428) +++ gtk/gtktextlayout.c (working copy) @@ -537,8 +537,7 @@ g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout)); g_return_if_fail (preedit_attrs != NULL || preedit_string == NULL); - if (layout->preedit_string) - g_free (layout->preedit_string); + g_free (layout->preedit_string); if (layout->preedit_attrs) pango_attr_list_unref (layout->preedit_attrs); @@ -1087,8 +1086,7 @@ gtk_text_attributes_ref (layout->default_style); layout->one_style_cache = layout->default_style; - if (tags) - g_free (tags); + g_free (tags); return layout->default_style; } Index: gtk/gtkiconview.c =================================================================== --- gtk/gtkiconview.c (revision 17428) +++ gtk/gtkiconview.c (working copy) @@ -7017,8 +7017,7 @@ item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (action); - if (item->action_descriptions[i]) - g_free (item->action_descriptions[i]); + g_free (item->action_descriptions[i]); item->action_descriptions[i] = g_strdup (description); Index: gtk/gtkfilesystem.c =================================================================== --- gtk/gtkfilesystem.c (revision 17428) +++ gtk/gtkfilesystem.c (working copy) @@ -103,14 +103,10 @@ { g_return_if_fail (info != NULL); - if (info->display_name) - g_free (info->display_name); - if (info->mime_type) - g_free (info->mime_type); - if (info->display_key) - g_free (info->display_key); - if (info->icon_name) - g_free (info->icon_name); + g_free (info->display_name); + g_free (info->mime_type); + g_free (info->display_key); + g_free (info->icon_name); g_free (info); } @@ -158,8 +154,7 @@ if (display_name == info->display_name) return; - if (info->display_name) - g_free (info->display_name); + g_free (info->display_name); if (info->display_key) { g_free (info->display_key); @@ -217,8 +212,7 @@ { g_return_if_fail (info != NULL); - if (info->mime_type) - g_free (info->mime_type); + g_free (info->mime_type); info->mime_type = g_strdup (mime_type); } @@ -264,8 +258,7 @@ { g_return_if_fail (info != NULL); - if (info->icon_name) - g_free (info->icon_name); + g_free (info->icon_name); info->icon_name = g_strdup (icon_name); } Index: gtk/gtkclist.c =================================================================== --- gtk/gtkclist.c (revision 17428) +++ gtk/gtkclist.c (working copy) @@ -2525,8 +2525,7 @@ !GTK_CLIST_AUTO_RESIZE_BLOCKED (clist)) column_auto_resize (clist, clist_row, column, requisition.width); - if (old_text) - g_free (old_text); + g_free (old_text); if (old_pixmap) gdk_pixmap_unref (old_pixmap); if (old_mask) @@ -6324,8 +6323,7 @@ gint column, const gchar *title) { - if (clist->column[column].title) - g_free (clist->column[column].title); + g_free (clist->column[column].title); clist->column[column].title = g_strdup (title); } @@ -6336,8 +6334,7 @@ gint i; for (i = 0; i < clist->columns; i++) - if (clist->column[i].title) - g_free (clist->column[i].title); + g_free (clist->column[i].title); g_free (clist->column); } Index: gtk/gtksettings.c =================================================================== --- gtk/gtksettings.c (revision 17428) +++ gtk/gtksettings.c (working copy) @@ -1862,8 +1862,7 @@ hint_style = CAIRO_HINT_STYLE_FULL; } - if (hint_style_str) - g_free (hint_style_str); + g_free (hint_style_str); cairo_font_options_set_hint_style (options, hint_style); Index: gtk/gtkcombo.c =================================================================== --- gtk/gtkcombo.c (revision 17428) +++ gtk/gtkcombo.c (working copy) @@ -232,8 +232,7 @@ gtk_editable_set_position (editable, pos); } - if (nprefix) - g_free (nprefix); + g_free (nprefix); g_free (prefix); g_completion_free (cmpl); Index: gtk/gtkfilesel.c =================================================================== --- gtk/gtkfilesel.c (revision 17428) +++ gtk/gtkfilesel.c (working copy) @@ -2386,8 +2386,7 @@ if (index != -1) { - if (fs->last_selected != NULL) - g_free (fs->last_selected); + g_free (fs->last_selected); fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); filename = get_real_filename (fs->last_selected, FALSE); @@ -2701,14 +2700,10 @@ cmpl_free_dir_list (cmpl_state->directory_storage); cmpl_free_dir_sent_list (cmpl_state->directory_sent_storage); - if (cmpl_state->user_dir_name_buffer) - g_free (cmpl_state->user_dir_name_buffer); - if (cmpl_state->user_directories) - g_free (cmpl_state->user_directories); - if (cmpl_state->the_completion.text) - g_free (cmpl_state->the_completion.text); - if (cmpl_state->updated_text) - g_free (cmpl_state->updated_text); + g_free (cmpl_state->user_dir_name_buffer); + g_free (cmpl_state->user_directories); + g_free (cmpl_state->the_completion.text); + g_free (cmpl_state->updated_text); g_free (cmpl_state); } @@ -3948,10 +3943,8 @@ error: - if (cmpl_state->user_dir_name_buffer) - g_free (cmpl_state->user_dir_name_buffer); - if (cmpl_state->user_directories) - g_free (cmpl_state->user_directories); + g_free (cmpl_state->user_dir_name_buffer); + g_free (cmpl_state->user_directories); cmpl_state->user_dir_name_buffer = NULL; cmpl_state->user_directories = NULL; Index: gtk/gtkselection.c =================================================================== --- gtk/gtkselection.c (revision 17428) +++ gtk/gtkselection.c (working copy) @@ -1116,8 +1116,7 @@ const guchar *data, gint length) { - if (selection_data->data) - g_free (selection_data->data); + g_free (selection_data->data); selection_data->type = type; selection_data->format = format; @@ -2933,8 +2932,7 @@ { g_return_if_fail (data != NULL); - if (data->data) - g_free (data->data); + g_free (data->data); g_free (data); } Index: gtk/gtkctree.c =================================================================== --- gtk/gtkctree.c (revision 17428) +++ gtk/gtkctree.c (working copy) @@ -3024,8 +3024,7 @@ !GTK_CLIST_AUTO_RESIZE_BLOCKED (clist)) column_auto_resize (clist, clist_row, column, requisition.width); - if (old_text) - g_free (old_text); + g_free (old_text); if (old_pixmap) gdk_pixmap_unref (old_pixmap); if (old_mask) Index: gtk/gtkrecentfilter.c =================================================================== --- gtk/gtkrecentfilter.c (revision 17428) +++ gtk/gtkrecentfilter.c (working copy) @@ -128,8 +128,7 @@ { GtkRecentFilter *filter = GTK_RECENT_FILTER (object); - if (filter->name) - g_free (filter->name); + g_free (filter->name); if (filter->rules) { @@ -202,8 +201,7 @@ { g_return_if_fail (GTK_IS_RECENT_FILTER (filter)); - if (filter->name) - g_free (filter->name); + g_free (filter->name); if (name) filter->name = g_strdup (name); Index: gtk/gtkrecentmanager.c =================================================================== --- gtk/gtkrecentmanager.c (revision 17428) +++ gtk/gtkrecentmanager.c (working copy) @@ -360,8 +360,7 @@ if (priv->poll_timeout) g_source_remove (priv->poll_timeout); - if (priv->filename) - g_free (priv->filename); + g_free (priv->filename); if (priv->recent_items) g_bookmark_file_free (priv->recent_items); @@ -1737,11 +1736,9 @@ if (!app_info) return; - if (app_info->name) - g_free (app_info->name); + g_free (app_info->name); - if (app_info->exec) - g_free (app_info->exec); + g_free (app_info->exec); g_free (app_info); } Index: gtk/gtkicontheme.c =================================================================== --- gtk/gtkicontheme.c (revision 17428) +++ gtk/gtkicontheme.c (working copy) @@ -999,10 +999,8 @@ static void free_unthemed_icon (UnthemedIcon *unthemed_icon) { - if (unthemed_icon->svg_filename) - g_free (unthemed_icon->svg_filename); - if (unthemed_icon->no_svg_filename) - g_free (unthemed_icon->no_svg_filename); + g_free (unthemed_icon->svg_filename); + g_free (unthemed_icon->no_svg_filename); g_slice_free (UnthemedIcon, unthemed_icon); } @@ -2434,11 +2432,9 @@ { g_return_if_fail (icon_info != NULL); - if (icon_info->filename) - g_free (icon_info->filename); + g_free (icon_info->filename); #ifdef G_OS_WIN32 - if (icon_info->cp_filename) - g_free (icon_info->cp_filename); + g_free (icon_info->cp_filename); #endif if (icon_info->pixbuf) g_object_unref (icon_info->pixbuf); @@ -2560,8 +2556,7 @@ bail: if (loader) g_object_unref (loader); - if (contents) - g_free (contents); + g_free (contents); return pixbuf; } Index: gtk/gtkimage.c =================================================================== --- gtk/gtkimage.c (revision 17428) +++ gtk/gtkimage.c (working copy) @@ -1894,8 +1894,7 @@ break; case GTK_IMAGE_ICON_NAME: - if (image->data.name.icon_name) - g_free (image->data.name.icon_name); + g_free (image->data.name.icon_name); image->data.name.icon_name = NULL; if (image->data.name.pixbuf) g_object_unref (image->data.name.pixbuf); Index: gtk/gtkentry.c =================================================================== --- gtk/gtkentry.c (revision 17428) +++ gtk/gtkentry.c (working copy) @@ -3402,8 +3402,7 @@ pango_layout_set_attributes (layout, tmp_attrs); - if (preedit_string) - g_free (preedit_string); + g_free (preedit_string); if (preedit_attrs) pango_attr_list_unref (preedit_attrs); Index: gtk/gtkprogress.c =================================================================== --- gtk/gtkprogress.c (revision 17428) +++ gtk/gtkprogress.c (working copy) @@ -273,8 +273,7 @@ if (progress->offscreen_pixmap) g_object_unref (progress->offscreen_pixmap); - if (progress->format) - g_free (progress->format); + g_free (progress->format); G_OBJECT_CLASS (gtk_progress_parent_class)->finalize (object); } Index: gtk/gtkfilefilter.c =================================================================== --- gtk/gtkfilefilter.c (revision 17428) +++ gtk/gtkfilefilter.c (working copy) @@ -130,8 +130,7 @@ g_slist_foreach (filter->rules, (GFunc)filter_rule_free, NULL); g_slist_free (filter->rules); - if (filter->name) - g_free (filter->name); + g_free (filter->name); G_OBJECT_CLASS (gtk_file_filter_parent_class)->finalize (object); } @@ -179,8 +178,7 @@ { g_return_if_fail (GTK_IS_FILE_FILTER (filter)); - if (filter->name) - g_free (filter->name); + g_free (filter->name); filter->name = g_strdup (name); } Index: gtk/gtkentrycompletion.c =================================================================== --- gtk/gtkentrycompletion.c (revision 17428) +++ gtk/gtkentrycompletion.c (working copy) @@ -573,8 +573,7 @@ if (priv->action_view) g_object_unref (priv->action_view); - if (priv->case_normalized_key) - g_free (priv->case_normalized_key); + g_free (priv->case_normalized_key); if (priv->popup_window) gtk_widget_destroy (priv->popup_window); @@ -1095,8 +1094,7 @@ if (!completion->priv->filter_model) return; - if (completion->priv->case_normalized_key) - g_free (completion->priv->case_normalized_key); + g_free (completion->priv->case_normalized_key); tmp = g_utf8_normalize (gtk_entry_get_text (GTK_ENTRY (completion->priv->entry)), -1, G_NORMALIZE_ALL); Index: gtk/gtkpreview.c =================================================================== --- gtk/gtkpreview.c (revision 17428) +++ gtk/gtkpreview.c (working copy) @@ -200,8 +200,7 @@ GTK_WIDGET (preview)->requisition.width = width; GTK_WIDGET (preview)->requisition.height = height; - if (preview->buffer) - g_free (preview->buffer); + g_free (preview->buffer); preview->buffer = NULL; } } @@ -416,8 +415,7 @@ g_return_if_fail (GTK_IS_PREVIEW (object)); preview = GTK_PREVIEW (object); - if (preview->buffer) - g_free (preview->buffer); + g_free (preview->buffer); preview->type = (GtkPreviewType) -1; G_OBJECT_CLASS (gtk_preview_parent_class)->finalize (object); @@ -549,8 +547,7 @@ (preview->buffer_width != width) || (preview->buffer_height != height)) { - if (preview->buffer) - g_free (preview->buffer); + g_free (preview->buffer); preview->buffer_width = width; preview->buffer_height = height; Index: gtk/gtktext.c =================================================================== --- gtk/gtktext.c (revision 17428) +++ gtk/gtktext.c (working copy) @@ -940,8 +940,7 @@ g_free (text->text.ch); text->text.wc = g_new (GdkWChar, INITIAL_BUFFER_SIZE); text->text_len = INITIAL_BUFFER_SIZE; - if (text->scratch_buffer.ch) - g_free (text->scratch_buffer.ch); + g_free (text->scratch_buffer.ch); text->scratch_buffer.wc = NULL; text->scratch_buffer_len = 0; } @@ -1224,13 +1223,11 @@ if (text->use_wchar) { - if (text->scratch_buffer.wc) - g_free (text->scratch_buffer.wc); + g_free (text->scratch_buffer.wc); } else { - if (text->scratch_buffer.ch) - g_free (text->scratch_buffer.ch); + g_free (text->scratch_buffer.ch); } g_list_free (text->tab_stops); Index: gtk/gtktoolitem.c =================================================================== --- gtk/gtktoolitem.c (revision 17428) +++ gtk/gtktoolitem.c (working copy) @@ -254,8 +254,7 @@ { GtkToolItem *item = GTK_TOOL_ITEM (object); - if (item->priv->menu_item_id) - g_free (item->priv->menu_item_id); + g_free (item->priv->menu_item_id); if (item->priv->menu_item) g_object_unref (item->priv->menu_item); @@ -1068,8 +1067,7 @@ g_return_if_fail (menu_item == NULL || GTK_IS_MENU_ITEM (menu_item)); g_return_if_fail (menu_item_id != NULL); - if (tool_item->priv->menu_item_id) - g_free (tool_item->priv->menu_item_id); + g_free (tool_item->priv->menu_item_id); tool_item->priv->menu_item_id = g_strdup (menu_item_id); Index: gtk/gtkrc.c =================================================================== --- gtk/gtkrc.c (revision 17428) +++ gtk/gtkrc.c (working copy) @@ -1166,14 +1166,12 @@ rc_style = GTK_RC_STYLE (object); rc_priv = GTK_RC_STYLE_GET_PRIVATE (rc_style); - if (rc_style->name) - g_free (rc_style->name); + g_free (rc_style->name); if (rc_style->font_desc) pango_font_description_free (rc_style->font_desc); for (i = 0; i < 5; i++) - if (rc_style->bg_pixmap_name[i]) - g_free (rc_style->bg_pixmap_name[i]); + g_free (rc_style->bg_pixmap_name[i]); /* Now remove all references to this rc_style from * realized_style_ht @@ -3039,8 +3037,7 @@ for (i = 0; i < 5; i++) { - if (rc_style->bg_pixmap_name[i]) - g_free (rc_style->bg_pixmap_name[i]); + g_free (rc_style->bg_pixmap_name[i]); rc_style->bg_pixmap_name[i] = g_strdup (parent_style->bg_pixmap_name[i]); } } @@ -3395,8 +3392,7 @@ if (pixmap_file) { - if (rc_style->bg_pixmap_name[state]) - g_free (rc_style->bg_pixmap_name[state]); + g_free (rc_style->bg_pixmap_name[state]); rc_style->bg_pixmap_name[state] = pixmap_file; } @@ -4051,8 +4047,7 @@ if (token != G_TOKEN_STRING) return G_TOKEN_STRING; - if (im_module_file) - g_free (im_module_file); + g_free (im_module_file); im_module_file = g_strdup (scanner->value.v_string); Index: gtk/gtktoolbar.c =================================================================== --- gtk/gtktoolbar.c (revision 17428) +++ gtk/gtktoolbar.c (working copy) @@ -3859,8 +3859,7 @@ content = toolbar_content_new_compatibility (toolbar, type, child_widget, child_icon, child_label, position); - if (free_me) - g_free (free_me); + g_free (free_me); return child_widget; } Index: gtk/gtkcellrenderertext.c =================================================================== --- gtk/gtkcellrenderertext.c (revision 17428) +++ gtk/gtkcellrenderertext.c (working copy) @@ -592,8 +592,7 @@ pango_font_description_free (celltext->font); - if (celltext->text) - g_free (celltext->text); + g_free (celltext->text); if (celltext->extra_attrs) pango_attr_list_unref (celltext->extra_attrs); @@ -1009,8 +1008,7 @@ switch (param_id) { case PROP_TEXT: - if (celltext->text) - g_free (celltext->text); + g_free (celltext->text); if (priv->markup_set) { @@ -1054,8 +1052,7 @@ return; } - if (celltext->text) - g_free (celltext->text); + g_free (celltext->text); if (celltext->extra_attrs) pango_attr_list_unref (celltext->extra_attrs); Index: gtk/gtktreedatalist.c =================================================================== --- gtk/gtktreedatalist.c (revision 17428) +++ gtk/gtktreedatalist.c (working copy) @@ -231,8 +231,7 @@ list->data.v_double = g_value_get_double (value); break; case G_TYPE_STRING: - if (list->data.v_pointer) - g_free (list->data.v_pointer); + g_free (list->data.v_pointer); list->data.v_pointer = g_value_dup_string (value); break; case G_TYPE_OBJECT: Index: gtk/gtkfilechooserentry.c =================================================================== --- gtk/gtkfilechooserentry.c (revision 17428) +++ gtk/gtkfilechooserentry.c (working copy) @@ -846,8 +846,7 @@ file_part_pos = 0; } - if (chooser_entry->file_part) - g_free (chooser_entry->file_part); + g_free (chooser_entry->file_part); chooser_entry->file_part = file_part; chooser_entry->file_part_pos = file_part_pos; Index: gdk-pixbuf/io-pcx.c =================================================================== --- gdk-pixbuf/io-pcx.c (revision 17428) +++ gdk-pixbuf/io-pcx.c (working copy) @@ -103,16 +103,12 @@ static void free_pcx_context(struct pcx_context *context, gboolean unref_pixbuf) { - if(context->header) - g_free(context->header); - if(context->buf) - g_free(context->buf); + g_free(context->header); + g_free(context->buf); if(unref_pixbuf && context->pixbuf) g_object_unref(context->pixbuf); - if(context->line) - g_free(context->line); - if(context->p_data) - g_free(context->p_data); + g_free(context->line); + g_free(context->p_data); g_free(context); } Index: gdk-pixbuf/io-png.c =================================================================== --- gdk-pixbuf/io-png.c (revision 17428) +++ gdk-pixbuf/io-png.c (working copy) @@ -283,8 +283,7 @@ } if (setjmp (png_ptr->jmpbuf)) { - if (rows) - g_free (rows); + g_free (rows); if (pixbuf) g_object_unref (pixbuf); Index: gdk-pixbuf/io-ico.c =================================================================== --- gdk-pixbuf/io-ico.c (revision 17428) +++ gdk-pixbuf/io-ico.c (working copy) @@ -176,11 +176,9 @@ static void context_free (struct ico_progressive_state *context) { - if (context->LineBuf != NULL) - g_free (context->LineBuf); + g_free (context->LineBuf); context->LineBuf = NULL; - if (context->HeaderBuf != NULL) - g_free (context->HeaderBuf); + g_free (context->HeaderBuf); if (context->pixbuf) g_object_unref (context->pixbuf); Index: gdk-pixbuf/io-tga.c =================================================================== --- gdk-pixbuf/io-tga.c (revision 17428) +++ gdk-pixbuf/io-tga.c (working copy) @@ -228,8 +228,7 @@ static void io_buffer_free(IOBuffer *buffer) { g_return_if_fail(buffer != NULL); - if (buffer->data) - g_free(buffer->data); + g_free(buffer->data); g_free(buffer); } @@ -943,11 +942,9 @@ ctx->pbuf->width, ctx->pbuf->height, ctx->udata); } - if (ctx->hdr) - g_free (ctx->hdr); + g_free (ctx->hdr); if (ctx->cmap) { - if (ctx->cmap->cols) - g_free (ctx->cmap->cols); + g_free (ctx->cmap->cols); g_free (ctx->cmap); } if (ctx->pbuf) Index: gdk-pixbuf/io-bmp.c =================================================================== --- gdk-pixbuf/io-bmp.c (revision 17428) +++ gdk-pixbuf/io-bmp.c (working copy) @@ -691,8 +691,7 @@ g_return_val_if_fail(context != NULL, TRUE); - if (context->Colormap != NULL) - g_free(context->Colormap); + g_free(context->Colormap); if (context->pixbuf) g_object_unref(context->pixbuf); Index: gdk-pixbuf/io-ras.c =================================================================== --- gdk-pixbuf/io-ras.c (revision 17428) +++ gdk-pixbuf/io-ras.c (working copy) @@ -281,10 +281,8 @@ g_return_val_if_fail(context != NULL, TRUE); - if (context->LineBuf != NULL) - g_free(context->LineBuf); - if (context->HeaderBuf != NULL) - g_free(context->HeaderBuf); + g_free(context->LineBuf); + g_free(context->HeaderBuf); if (context->pixbuf) g_object_unref(context->pixbuf); Index: tests/testmultidisplay.c =================================================================== --- tests/testmultidisplay.c (revision 17428) +++ tests/testmultidisplay.c (working copy) @@ -39,8 +39,7 @@ { if (response_id == GTK_RESPONSE_DELETE_EVENT) return; - if (screen2_name) - g_free (screen2_name); + g_free (screen2_name); screen2_name = g_strdup (gtk_entry_get_text (entry)); } Index: modules/input/gtkimcontextxim.c =================================================================== --- modules/input/gtkimcontextxim.c (revision 17428) +++ modules/input/gtkimcontextxim.c (working copy) @@ -1159,8 +1159,7 @@ context->preedit_length += diff; - if (new_text) - g_free (new_text); + g_free (new_text); if (!context->finalizing) g_signal_emit_by_name (context, "preedit_changed"); Index: modules/printbackends/cups/gtkprintbackendcups.c =================================================================== --- modules/printbackends/cups/gtkprintbackendcups.c (revision 17428) +++ modules/printbackends/cups/gtkprintbackendcups.c (working copy) @@ -613,8 +613,7 @@ dispatch->backend = NULL; } - if (dispatch->data_poll != NULL) - g_free (dispatch->data_poll); + g_free (dispatch->data_poll); } static GSourceFuncs _cups_dispatch_watch_funcs = { Index: modules/engines/pixbuf/pixbuf-render.c =================================================================== --- modules/engines/pixbuf/pixbuf-render.c (revision 17428) +++ modules/engines/pixbuf/pixbuf-render.c (working copy) @@ -487,8 +487,7 @@ theme_pb->pixbuf = NULL; } - if (theme_pb->filename) - g_free (theme_pb->filename); + g_free (theme_pb->filename); if (filename) theme_pb->filename = g_strdup (filename); Index: modules/engines/pixbuf/pixbuf-rc-style.c =================================================================== --- modules/engines/pixbuf/pixbuf-rc-style.c (revision 17428) +++ modules/engines/pixbuf/pixbuf-rc-style.c (working copy) @@ -375,8 +375,7 @@ if (token != G_TOKEN_STRING) return G_TOKEN_STRING; - if (data->match_data.detail) - g_free (data->match_data.detail); + g_free (data->match_data.detail); data->match_data.detail = g_strdup(scanner->value.v_string); @@ -622,8 +621,7 @@ data->refcount--; if (data->refcount == 0) { - if (data->match_data.detail) - g_free (data->match_data.detail); + g_free (data->match_data.detail); if (data->background) theme_pixbuf_destroy (data->background); if (data->overlay) Index: gdk/gdkevents.c =================================================================== --- gdk/gdkevents.c (revision 17428) +++ gdk/gdkevents.c (working copy) @@ -465,8 +465,7 @@ case GDK_BUTTON_PRESS: case GDK_BUTTON_RELEASE: - if (event->button.axes) - g_free (event->button.axes); + g_free (event->button.axes); break; case GDK_EXPOSE: @@ -475,8 +474,7 @@ break; case GDK_MOTION_NOTIFY: - if (event->motion.axes) - g_free (event->motion.axes); + g_free (event->motion.axes); break; case GDK_SETTING: Index: gdk/linux-fb/mispans.c =================================================================== --- gdk/linux-fb/mispans.c (revision 17428) +++ gdk/linux-fb/mispans.c (working copy) @@ -195,7 +195,7 @@ void miFreeSpanGroup(SpanGroup *spanGroup) { - if (spanGroup->group != NULL) g_free(spanGroup->group); + g_free(spanGroup->group); } static void QuickSortSpansX(register GdkSpan points[], register int numSpans) @@ -368,10 +368,8 @@ if (!yspans || !ysizes) { - if (yspans) - g_free (yspans); - if (ysizes) - g_free (ysizes); + g_free (yspans); + g_free (ysizes); miDisposeSpanGroup (spanGroup); return; } @@ -438,8 +436,7 @@ } g_free (yspans); g_free (ysizes); - if (points) - g_free (points); + g_free (points); return; } count = 0; Index: gdk/linux-fb/miarc.c =================================================================== --- gdk/linux-fb/miarc.c (revision 17428) +++ gdk/linux-fb/miarc.c (working copy) @@ -835,8 +835,7 @@ spdata = lruent->spdata; if (!spdata || spdata->k != k) { - if (spdata) - g_free(spdata); + g_free(spdata); spdata = (miArcSpanData *)g_malloc(sizeof(miArcSpanData) + sizeof(miArcSpan) * (k + 2)); lruent->spdata = spdata; Index: gdk/quartz/gdkgc-quartz.c =================================================================== --- gdk/quartz/gdkgc-quartz.c (revision 17428) +++ gdk/quartz/gdkgc-quartz.c (working copy) @@ -251,8 +251,7 @@ dst_quartz_gc->cap_style = src_quartz_gc->cap_style; dst_quartz_gc->join_style = src_quartz_gc->join_style; - if (dst_quartz_gc->dash_lengths) - g_free (dst_quartz_gc->dash_lengths); + g_free (dst_quartz_gc->dash_lengths); dst_quartz_gc->dash_lengths = g_memdup (src_quartz_gc->dash_lengths, sizeof (float) * src_quartz_gc->dash_count); dst_quartz_gc->dash_count = src_quartz_gc->dash_count; Index: gdk/gdk.c =================================================================== --- gdk/gdk.c (revision 17428) +++ gdk/gdk.c (working copy) @@ -692,8 +692,7 @@ void gdk_set_program_class (const char *program_class) { - if (gdk_progclass) - g_free (gdk_progclass); + g_free (gdk_progclass); gdk_progclass = g_strdup (program_class); } Index: gdk/gdkwindow.c =================================================================== --- gdk/gdkwindow.c (revision 17428) +++ gdk/gdkwindow.c (working copy) @@ -2130,8 +2130,7 @@ else gdk_draw_trapezoids (private->impl, gc, trapezoids, n_trapezoids); - if (new_trapezoids) - g_free (new_trapezoids); + g_free (new_trapezoids); RESTORE_GC (gc); } Index: gdk/gdkrgb.c =================================================================== --- gdk/gdkrgb.c (revision 17428) +++ gdk/gdkrgb.c (working copy) @@ -526,8 +526,7 @@ { GSList *tmp_list; - if (image_info->stage_buf) - g_free (image_info->stage_buf); + g_free (image_info->stage_buf); if (image_info->gray_cmap) gdk_rgb_cmap_free (image_info->gray_cmap); @@ -535,11 +534,9 @@ if (image_info->own_gc) g_object_unref (image_info->own_gc); - if (image_info->colorcube) - g_free (image_info->colorcube); + g_free (image_info->colorcube); - if (image_info->colorcube_d) - g_free (image_info->colorcube_d); + g_free (image_info->colorcube_d); tmp_list = image_info->cmap_info_list; while (tmp_list) Index: gdk/win32/gdkproperty-win32.c =================================================================== --- gdk/win32/gdkproperty-win32.c (revision 17428) +++ gdk/win32/gdkproperty-win32.c (working copy) @@ -240,8 +240,7 @@ WIN32_API_FAILED ("GlobalAlloc"); if (!CloseClipboard ()) WIN32_API_FAILED ("CloseClipboard"); - if (buf != NULL) - g_free (buf); + g_free (buf); return; } Index: gdk/win32/gdkgc-win32.c =================================================================== --- gdk/win32/gdkgc-win32.c (revision 17428) +++ gdk/win32/gdkgc-win32.c (working copy) @@ -107,8 +107,7 @@ if (win32_gc->values_mask & GDK_GC_FONT) gdk_font_unref (win32_gc->font); - if (win32_gc->pen_dashes) - g_free (win32_gc->pen_dashes); + g_free (win32_gc->pen_dashes); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -618,8 +617,7 @@ if (dst_win32_gc->font != NULL) gdk_font_unref (dst_win32_gc->font); - if (dst_win32_gc->pen_dashes) - g_free (dst_win32_gc->pen_dashes); + g_free (dst_win32_gc->pen_dashes); dst_win32_gc->hcliprgn = src_win32_gc->hcliprgn; if (dst_win32_gc->hcliprgn) Index: gdk/x11/gdkscreen-x11.c =================================================================== --- gdk/x11/gdkscreen-x11.c (revision 17428) +++ gdk/x11/gdkscreen-x11.c (working copy) @@ -639,8 +639,7 @@ int opcode, firstevent, firsterror; #endif - if (screen_x11->monitors) - g_free (screen_x11->monitors); + g_free (screen_x11->monitors); #ifdef HAVE_XINERAMA if (XQueryExtension (GDK_SCREEN_XDISPLAY (screen), "XINERAMA", Index: gdk/x11/gdkinput-x11.c =================================================================== --- gdk/x11/gdkinput-x11.c (revision 17428) +++ gdk/x11/gdkinput-x11.c (working copy) @@ -247,12 +247,9 @@ error: g_free (gdkdev->info.name); - if (gdkdev->axes) - g_free (gdkdev->axes); - if (gdkdev->info.keys) - g_free (gdkdev->info.keys); - if (gdkdev->info.axes) - g_free (gdkdev->info.axes); + g_free (gdkdev->axes); + g_free (gdkdev->info.keys); + g_free (gdkdev->info.axes); g_object_unref (gdkdev); return NULL; Index: gdk/x11/gdkwindow-x11.c =================================================================== --- gdk/x11/gdkwindow-x11.c (revision 17428) +++ gdk/x11/gdkwindow-x11.c (working copy) @@ -194,8 +194,7 @@ _gdk_xid_table_remove (display, window_impl->toplevel->focus_window); } - if (window_impl->toplevel) - g_free (window_impl->toplevel); + g_free (window_impl->toplevel); if (window_impl->cursor) gdk_cursor_unref (window_impl->cursor);