pidgin: src/gtkblist.c comparison

comparison src/gtkblist.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	6fc412e59214
children	36bb845aa622

comparison

equal deleted inserted replaced

-:0839a7b71325
+:8bda65b88e49
 	{
 		gtk_container_remove(GTK_CONTAINER(data->entries_box),
 			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
 	}
-	if (data->entries != NULL)
+	g_list_free(data->entries);
-		g_list_free(data->entries);
 	data->entries = NULL;
 	if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info != NULL)
 		list = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
 	g_free(temp_vcard);
 	if (aims == NULL && icqs == NULL && yahoos == NULL &&
 		msns == NULL && jabbers == NULL)
 	{
-		if (alias != NULL)
+		g_free(alias);
-			g_free(alias);
 		return FALSE;
 	}
 	add_buddies_from_vcard("prpl-oscar",  group, aims,    alias);
 	add_buddies_from_vcard("prpl-oscar",  group, icqs,    alias);
 	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,  alias);
 	add_buddies_from_vcard("prpl-msn",    group, msns,    alias);
 	add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
-	if (alias != NULL)
+	g_free(alias);
-		g_free(alias);
 	return TRUE;
 }
 #ifdef _WIN32
 		GaimBuddy *buddy;
 		GaimConnection *gc;
 		GValue val;
 		GString *str;
 		const char *protocol;
-		char *mime_str;
 		ref = g_object_get_data(G_OBJECT(dc), "gtk-tree-view-source-row");
 		sourcerow = gtk_tree_row_reference_get_path(ref);
 		if (!sourcerow)
 				buddy->alias);
 		}
 		str = g_string_append(str, "\r\n");
-		mime_str = g_string_free(str, FALSE);
 		gtk_selection_data_set(data,
 					gdk_atom_intern("application/x-im-contact", FALSE),
 					8, /* bits */
-					(const guchar *)mime_str,
+					(const guchar *)str->str,
-					strlen(mime_str) + 1);
+					strlen(str->str) + 1);
-		g_free(mime_str);
+		g_string_free(str, TRUE);
 		gtk_tree_path_free(sourcerow);
 	}
 }
 static void gaim_gtk_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 											 (group ? group->name : NULL),
 											 alias);
 			}
 		}
-		if (username != NULL) g_free(username);
+		g_free(username);
-		if (protocol != NULL) g_free(protocol);
+		g_free(protocol);
-		if (alias    != NULL) g_free(alias);
+		g_free(alias);
 		if (path != NULL)
 			gtk_tree_path_free(path);
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	if(!gaim_presence_is_online(presence) && !statustext)
 		statustext = g_strdup(_("Offline"));
 	else if (!statustext)
 		text = g_strdup(esc);
 	if (gaim_presence_is_idle(presence)) {
 		if (gaim_prefs_get_bool("/gaim/gtk/blist/show_idle_time")) {
 			time_t idle_secs = gaim_presence_get_idle_time(presence);
 			if (idle_secs > 0) {
 			(idletime != NULL && statustext != NULL) ? " - " : "",
 			statustext != NULL ? statustext :  "");
 	}
 	/* It is selected. */
 	if ((selected && !text) || (selected && idletime))
 		text = g_strdup_printf("%s\n"
 			"<span size='smaller'>%s%s%s</span>",
 			esc,
 			idletime != NULL ? idletime : "",
 			(idletime != NULL && statustext != NULL) ? " - " : "",
 {
 	GaimBlistNode *gnode, *cnode;
 	if (gtk_blist_obscured || !GTK_WIDGET_VISIBLE(gtkblist->window))
 		return TRUE;
 	for(gnode = list->root; gnode; gnode = gnode->next) {
 		if(!GAIM_BLIST_NODE_IS_GROUP(gnode))
 			continue;
 		for(cnode = gnode->child; cnode; cnode = cnode->next) {
 			if(GAIM_BLIST_NODE_IS_CONTACT(cnode)) {
 				buddy = gaim_contact_get_priority_buddy((GaimContact*)cnode);
 				if (buddy &&
 						gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
 					gaim_gtk_blist_update_contact(list, (GaimBlistNode*)buddy);
 			}
 		}
 	}
 	/* keep on going */
 	else
 		gaim_gtk_blist_update_group(list, cnode->parent);
 	contact = (GaimContact*)cnode;
 	buddy = gaim_contact_get_priority_buddy(contact);
 	if (buddy_is_displayable(buddy))
 	{
 		GtkTreeIter iter;
 		if(!insert_node(list, cnode, &iter))
 	struct _gaim_gtk_blist_node *gtkparentnode;
 	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
 	if (node->parent == NULL)
 		return;
 	buddy = (GaimBuddy*)node;
 	/* First things first, update the contact */
 	gaim_gtk_blist_update_contact(list, node);
 	gtkparentnode = (struct _gaim_gtk_blist_node *)node->parent->ui_data;
 	{
 		gtk_container_remove(GTK_CONTAINER(data->entries_box),
 			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
 	}
-	if (data->entries != NULL)
+	g_list_free(data->entries);
-		g_list_free(data->entries);
 	data->entries = NULL;
 	if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info != NULL)
 		list = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info(gc);
 		plugin_submenus = g_list_append(plugin_submenus, menuitem);
 		submenu = gtk_menu_new();
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 		gtk_widget_show(submenu);
 		gtk_menu_set_accel_group(GTK_MENU(submenu), accel_group);
 		path = g_strdup_printf("%s/Tools/%s", gtkblist->ift->path, plugin->info->name);
 		gtk_menu_set_accel_path(GTK_MENU(submenu), path);
 		g_free(path);

Mercurial > pidgin

comparison src/gtkblist.c @ 14035:8bda65b88e49