aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorTravis Reitter <treitter@gmail.com>2010-08-13 06:54:21 +0800
committerTravis Reitter <treitter@gmail.com>2010-08-16 23:59:01 +0800
commit90a91152a1d7db0c8f33eaf73ca766051efd7422 (patch)
tree9a3d07cb2dee304eae7cb51bcb56388f7d8fd95e /libempathy-gtk
parentb52cc53444e1373c7f4d179634fcf8566f0786f3 (diff)
downloadgsoc2013-empathy-90a91152a1d7db0c8f33eaf73ca766051efd7422.tar
gsoc2013-empathy-90a91152a1d7db0c8f33eaf73ca766051efd7422.tar.gz
gsoc2013-empathy-90a91152a1d7db0c8f33eaf73ca766051efd7422.tar.bz2
gsoc2013-empathy-90a91152a1d7db0c8f33eaf73ca766051efd7422.tar.lz
gsoc2013-empathy-90a91152a1d7db0c8f33eaf73ca766051efd7422.tar.xz
gsoc2013-empathy-90a91152a1d7db0c8f33eaf73ca766051efd7422.tar.zst
gsoc2013-empathy-90a91152a1d7db0c8f33eaf73ca766051efd7422.zip
Also support file transfer in the Personas menu.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-individual-menu.c24
-rw-r--r--libempathy-gtk/empathy-individual-menu.h3
2 files changed, 20 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 976c15cb4..994bdf1f2 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -230,7 +230,7 @@ empathy_individual_menu_new (FolksIndividual *individual,
gtk_widget_show (item);
/* File transfer */
- item = empathy_individual_file_transfer_menu_item_new (individual);
+ item = empathy_individual_file_transfer_menu_item_new (individual, NULL);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
@@ -624,12 +624,15 @@ empathy_individual_file_transfer_menu_item_activated (GtkMenuItem *item,
}
GtkWidget *
-empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual)
+empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual,
+ EmpathyContact *contact)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) ||
+ EMPATHY_IS_CONTACT (contact),
+ NULL);
item = gtk_image_menu_item_new_with_mnemonic (_("Send File"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND,
@@ -637,9 +640,18 @@ empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual)
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
- menu_item_set_first_contact (item, individual,
- G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
- empathy_contact_can_send_files);
+ if (contact != NULL)
+ {
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
+ empathy_contact_can_send_files);
+ }
+ else
+ {
+ menu_item_set_first_contact (item, individual,
+ G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
+ empathy_contact_can_send_files);
+ }
return item;
}
diff --git a/libempathy-gtk/empathy-individual-menu.h b/libempathy-gtk/empathy-individual-menu.h
index 8c89ab708..de7b021f0 100644
--- a/libempathy-gtk/empathy-individual-menu.h
+++ b/libempathy-gtk/empathy-individual-menu.h
@@ -57,7 +57,8 @@ GtkWidget * empathy_individual_link_menu_item_new (FolksIndividual *individual);
GtkWidget * empathy_individual_invite_menu_item_new (
FolksIndividual *individual);
GtkWidget * empathy_individual_file_transfer_menu_item_new (
- FolksIndividual *individual);
+ FolksIndividual *individual,
+ EmpathyContact *contact);
GtkWidget * empathy_individual_share_my_desktop_menu_item_new (
FolksIndividual *individual,
EmpathyContact *contact);