pidgin: src/gtkimhtml.c comparison

comparison src/gtkimhtml.c @ 14035:8bda65b88e49

[gaim-migrate @ 16638] A bunch of small changes. Mostly remove "if not null" checks before calling g_free, g_list_free, g_slist_free and g_strdup. Also use g_list_foreach() to call g_free to free strings in an array. And some whitespace changes here and there. committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Sat, 05 Aug 2006 08:27:39 +0000
parents	11434fa0ca22
children	5e6d4c36630a

comparison

equal deleted inserted replaced

-:0839a7b71325
+:8bda65b88e49
 		g_free(imhtml->clipboard_html_string);
 	}
 	g_list_free(imhtml->scalables);
 	g_slist_free(imhtml->im_images);
-	if (imhtml->protocol_name)
+	g_free(imhtml->protocol_name);
-		g_free(imhtml->protocol_name);
+	g_free(imhtml->search_string);
-	if (imhtml->search_string)
-		g_free(imhtml->search_string);
 	G_OBJECT_CLASS(parent_class)->finalize (object);
 }
 /* Boring GTK+ stuff */
 static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 						char *bgcolor = gtk_imhtml_get_html_opt (tag, "BGCOLOR=");
 						if (bgcolor && (imhtml->format_functions & GTK_IMHTML_BACKCOLOR)) {
 							gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
 							ws[0] = '\0'; wpos = 0;
 							/* NEW_BIT(NEW_TEXT_BIT); */
-							if (bg)
+							g_free(bg);
-								g_free(bg);
 							bg = bgcolor;
 							gtk_imhtml_toggle_background(imhtml, bg);
 						}
 					}
 					break;
 						if (href && (imhtml->format_functions & GTK_IMHTML_LINK)) {
 							gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
 							ws[0] = '\0'; wpos = 0;
 							gtk_imhtml_toggle_link(imhtml, href);
 						}
-						if (href)
+						g_free(href);
-							g_free(href);
 					}
 					break;
 				case 46:	/* IMG (opt) */
 				case 59:	/* IMG */
 					{
 	/* NEW_BIT(NEW_TEXT_BIT); */
 	while (fonts) {
 		GtkIMHtmlFontDetail *font = fonts->data;
 		fonts = g_slist_remove (fonts, font);
-		if (font->face)
+		g_free (font->face);
-			g_free (font->face);
+		g_free (font->fore);
-		if (font->fore)
+		g_free (font->back);
-			g_free (font->fore);
+		g_free (font->sml);
-		if (font->back)
-			g_free (font->back);
-		if (font->sml)
-			g_free (font->sml);
 		g_free (font);
 	}
 	g_free(ws);
 	g_free(bg);
 	return imhtml->protocol_name;
 }
 void
 gtk_imhtml_set_protocol_name(GtkIMHtml *imhtml, const gchar *protocol_name) {
-	if (imhtml->protocol_name)
+	g_free(imhtml->protocol_name);
-		g_free(imhtml->protocol_name);
+	imhtml->protocol_name = g_strdup(protocol_name);
-	imhtml->protocol_name = protocol_name ? g_strdup(protocol_name) : NULL;
 }
 void
 gtk_imhtml_delete(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end) {
 	GList *l;
 	im_image->pixbuf = img;
 	im_image->image = image;
 	im_image->width = gdk_pixbuf_get_width(img);
 	im_image->height = gdk_pixbuf_get_height(img);
 	im_image->mark = NULL;
-	im_image->filename = filename ? g_strdup(filename) : NULL;
+	im_image->filename = g_strdup(filename);
 	im_image->id = id;
 	im_image->filesel = NULL;
 	g_object_ref(img);
 	return GTK_IMHTML_SCALABLE(im_image);
 void gtk_imhtml_image_free(GtkIMHtmlScalable *scale)
 {
 	GtkIMHtmlImage *image = (GtkIMHtmlImage *)scale;
 	g_object_unref(image->pixbuf);
-	if (image->filename)
+	g_free(image->filename);
-		g_free(image->filename);
 	if (image->filesel)
 		gtk_widget_destroy(image->filesel);
 	g_free(scale);
 }
 	gtk_text_buffer_get_start_iter(imhtml->text_buffer, &start);
 	gtk_text_buffer_get_end_iter(imhtml->text_buffer, &end);
 	gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "search", &start, &end);
-	if (imhtml->search_string)
+	g_free(imhtml->search_string);
-		g_free(imhtml->search_string);
 	imhtml->search_string = NULL;
 }
 static GtkTextTag *find_font_forecolor_tag(GtkIMHtml *imhtml, gchar *color)
 {
 			gtk_text_buffer_remove_tag(imhtml->text_buffer, tag, start, end);
 			if (tag->name &&
 					strncmp(tag->name, "LINK ", 5) == 0 && imhtml->edit.link) {
 				gtk_imhtml_toggle_link(imhtml, NULL);
 			}
 		}
 	}
 	g_slist_free(tags);
 }
 static void gtk_imhtml_apply_tags_on_insert(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end)
 }
 char *
 gtk_imhtml_get_current_fontface(GtkIMHtml *imhtml)
 {
-	if (imhtml->edit.fontface)
+	return g_strdup(imhtml->edit.fontface);
-		return g_strdup(imhtml->edit.fontface);
-	else
-		return NULL;
 }
 char *
 gtk_imhtml_get_current_forecolor(GtkIMHtml *imhtml)
 {
-	if (imhtml->edit.forecolor)
+	return g_strdup(imhtml->edit.forecolor);
-		return g_strdup(imhtml->edit.forecolor);
-	else
-		return NULL;
 }
 char *
 gtk_imhtml_get_current_backcolor(GtkIMHtml *imhtml)
 {
-	if (imhtml->edit.backcolor)
+	return g_strdup(imhtml->edit.backcolor);
-		return g_strdup(imhtml->edit.backcolor);
-	else
-		return NULL;
 }
 char *
 gtk_imhtml_get_current_background(GtkIMHtml *imhtml)
 {
-	if (imhtml->edit.background)
+	return g_strdup(imhtml->edit.background);
-		return g_strdup(imhtml->edit.background);
-	else
-		return NULL;
 }
 gint
 gtk_imhtml_get_current_fontsize(GtkIMHtml *imhtml)
 {
 	if (!gtk_text_buffer_get_char_count(buffer))
 		return;
 	imhtml->edit.bold = imhtml->edit.italic = imhtml->edit.underline = imhtml->edit.strike = FALSE;
-	if (imhtml->edit.forecolor)
+	g_free(imhtml->edit.forecolor);
-		g_free(imhtml->edit.forecolor);
 	imhtml->edit.forecolor = NULL;
-	if (imhtml->edit.backcolor)
-		g_free(imhtml->edit.backcolor);
+	g_free(imhtml->edit.backcolor);
 	imhtml->edit.backcolor = NULL;
-	if (imhtml->edit.fontface)
-		g_free(imhtml->edit.fontface);
+	g_free(imhtml->edit.fontface);
 	imhtml->edit.fontface = NULL;
 	imhtml->edit.fontsize = 0;
 	imhtml->edit.link = NULL;
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, mark);

Mercurial > pidgin

comparison src/gtkimhtml.c @ 14035:8bda65b88e49