[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/src status.c,1.62,1.63
From: |
Colin Leroy <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/src status.c,1.62,1.63 |
Date: |
Fri, 21 Mar 2003 13:29:54 -0500 |
Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv31714/src
Modified Files:
status.c
Log Message:
Add specific menu items to accounts too
Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- status.c 21 Mar 2003 13:16:58 -0000 1.62
+++ status.c 21 Mar 2003 18:29:52 -0000 1.63
@@ -413,7 +413,7 @@
if (mid->protocol == NULL
|| find_account_for_protocol(conn,
get_service_id(mid->protocol))) {
- eb_debug(DBG_CORE, "adding chat window item: %s
(%d)\n", mid->label, mid->protocol);
+ eb_debug(DBG_CORE, "adding contact menu item:
%s (%d)\n", mid->label, mid->protocol);
button =
gtk_menu_item_new_with_label(mid->label);
gtk_menu_append(GTK_MENU(menu), button);
gtk_signal_connect(GTK_OBJECT(button),
"activate",
@@ -430,10 +430,14 @@
static void account_menu(GdkEventButton * event, gpointer d )
{
- GtkWidget * menu;
+ GtkWidget * menu, *button;
eb_account *acc = (eb_account *)d;
- menu = gtk_menu_new();
+ menu_data *md=NULL;
+ menu_item_data *mid=NULL;
+ ebmContactData *ecd=NULL;
+ LList *list=NULL;
+ menu = gtk_menu_new();
if (contact_list && acc->list_item)
gtk_tree_select_child(GTK_TREE(contact_list), acc->list_item);
@@ -445,11 +449,33 @@
eb_menu_button (GTK_MENU(menu), NULL, NULL, NULL); /* sep */
- eb_menu_button (GTK_MENU(menu), _("Send File..."),
+ if (CAN(acc, send_file))
+ eb_menu_button (GTK_MENU(menu), _("Send File..."),
GTK_SIGNAL_FUNC(send_file_callback), d);
eb_menu_button (GTK_MENU(menu), _("Info..."),
GTK_SIGNAL_FUNC(get_info),d);
+
+ md = GetPref(EB_CONTACT_MENU);
+ if(md) {
+ for(list = md->menu_items; list; list = list->next ) {
+ ecd=ebmContactData_new();
+ ecd->contact=acc->account_contact->nick;
+ mid=(menu_item_data *)list->data;
+ mid->data=(ebmCallbackData *)ecd;
+
+ ecd->local_account = acc->handle;
+
+ if (mid->protocol == NULL || !strcmp(mid->protocol,
get_service_name(acc->service_id))) {
+ eb_debug(DBG_CORE, "adding account menu item:
%s (%d)\n", mid->label, mid->protocol);
+ button =
gtk_menu_item_new_with_label(mid->label);
+ gtk_menu_append(GTK_MENU(menu), button);
+ gtk_signal_connect(GTK_OBJECT(button),
"activate",
+ eb_generic_menu_function, mid);
+ gtk_widget_show(button);
+ }
+ }
+ }
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
event->button, event->time );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/src status.c,1.62,1.63,
Colin Leroy <address@hidden> <=
- Prev by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.365,1.366 configure.in,1.360,1.361
- Next by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.366,1.367 configure.in,1.361,1.362
- Previous by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.365,1.366 configure.in,1.360,1.361
- Next by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.366,1.367 configure.in,1.361,1.362
- Index(es):