Commit 65ebc3c5 authored by Travis Reitter's avatar Travis Reitter

Make Send File context menu choose the first capable contact.

parent 148655a2
...@@ -458,17 +458,12 @@ empathy_individual_log_menu_item_new (FolksIndividual *individual) ...@@ -458,17 +458,12 @@ empathy_individual_log_menu_item_new (FolksIndividual *individual)
} }
static void static void
individual_file_transfer_menu_item_activate_cb (FolksIndividual *individual) empathy_individual_file_transfer_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{ {
EmpathyContact *contact;
contact = empathy_contact_dup_from_folks_individual (individual);
g_return_if_fail (EMPATHY_IS_CONTACT (contact)); g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_send_file_with_file_chooser (contact); empathy_send_file_with_file_chooser (contact);
g_object_unref (contact);
} }
GtkWidget * GtkWidget *
...@@ -476,25 +471,18 @@ empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual) ...@@ -476,25 +471,18 @@ empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual)
{ {
GtkWidget *item; GtkWidget *item;
GtkWidget *image; GtkWidget *image;
EmpathyContact *contact;
g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL); g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
contact = empathy_contact_dup_from_folks_individual (individual);
g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
item = gtk_image_menu_item_new_with_mnemonic (_("Send File")); item = gtk_image_menu_item_new_with_mnemonic (_("Send File"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND, image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND,
GTK_ICON_SIZE_MENU); GTK_ICON_SIZE_MENU);
gtk_widget_set_sensitive (item, empathy_contact_can_send_files (contact));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image); gtk_widget_show (image);
g_signal_connect_swapped (item, "activate", menu_item_set_first_contact (item, individual,
G_CALLBACK (individual_file_transfer_menu_item_activate_cb), individual); G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
empathy_contact_can_send_files);
g_object_unref (contact);
return item; return item;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment