diff src/gtkimhtmltoolbar.c @ 9041:812e7aa7eafa

[gaim-migrate @ 9817] nosnilmot wrote: " Yahoo & MSN support a subset of formatting which does not include sending descriptions with links. This patch adds a connection flag GAIM_CONNECTION_NO_URLDESC to allow prpls to specify this limitation (and modifies Yahoo & MSN to do so) It also adds GTK_IMHTML_LINKDESC to the GtkIMHtmlButtons enum (I pondered over this, then realized it's referred to as "format_functions" in some places, so probably could be renamed to GtkIMHtmlOptions or something) This combination allows the GtkIMHtmlToolbar to intelligently ask for only a URL if a description is not supported. One slightly unfortunate side effect is it makes bug 955538 much more prominent on Yahoo" committer: Tailor Script <[e-mail]>

--- a/src/gtkimhtmltoolbar.c	Sun May 23 20:12:36 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Sun May 23 21:40:58 2004 +0000
@@ -358,7 +358,10 @@
 	const char *url, *description;
 
 	url         = gaim_request_fields_get_string(fields, "url");
-	description = gaim_request_fields_get_string(fields, "description");
+	if (GTK_IMHTML(toolbar->imhtml)->format_functions & GTK_IMHTML_LINKDESC)
+		description = gaim_request_fields_get_string(fields, "description");
+	else
+		description = NULL;
 
 	if (description == NULL)
 		description = url;
@@ -379,6 +382,7 @@
 		GaimRequestFields *fields;
 		GaimRequestFieldGroup *group;
 		GaimRequestField *field;
+		char *msg;
 
 		fields = gaim_request_fields_new();
 
@@ -389,20 +393,27 @@
 		gaim_request_field_set_required(field, TRUE);
 		gaim_request_field_group_add_field(group, field);
 
-		field = gaim_request_field_string_new("description", _("_Description"),
-						      NULL, FALSE);
-		gaim_request_field_group_add_field(group, field);
+		if(GTK_IMHTML(toolbar->imhtml)->format_functions & GTK_IMHTML_LINKDESC) {
+			field = gaim_request_field_string_new("description", _("_Description"),
+							      NULL, FALSE);
+			gaim_request_field_group_add_field(group, field);
+			msg = g_strdup(_("Please enter the URL and description of the "
+							 "link that you want to insert. The description "
+							 "is optional."));
+		} else {
+			msg = g_strdup(_("Please enter the URL of the "
+									"link that you want to insert."));
+		}
 
 		toolbar->link_dialog =
 			gaim_request_fields(toolbar, _("Insert Link"),
 					    NULL,
-					    _("Please enter the URL and description of the "
-					      "link that you want to insert. The description "
-					      "is optional."),
+						msg,
 					    fields,
 					    _("_Insert"), G_CALLBACK(do_insert_link_cb),
 					    _("Cancel"), G_CALLBACK(cancel_link_cb),
 					    toolbar);
+		g_free(msg);
 	} else {
 		close_link_dialog(toolbar);
 	}