[Ayttm-commits] CVS: ayttm/src away_window.c,1.7,1.8 dialog.c,1.7,1.8 dialog.h,1.3,1.4 status.c,1.14,1.15

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv2071/src

Modified Files:
        away_window.c dialog.c dialog.h status.c 
Log Message:
                Changed more menus with "..." and separators



Index: away_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/away_window.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- away_window.c       10 Jan 2003 12:25:32 -0000      1.7
+++ away_window.c       10 Jan 2003 15:02:15 -0000      1.8
@@ -148,7 +148,7 @@
        gtk_menu_append(GTK_MENU(away_menu), label);
        gtk_widget_show(label);
 
-       label = gtk_menu_item_new_with_label(_("New Away Message"));
+       label = gtk_menu_item_new_with_label(_("New Away Message..."));
        gtk_menu_append(GTK_MENU(away_menu), label);
        gtk_signal_connect(GTK_OBJECT(label), "activate",
                                show_away2, NULL );

Index: dialog.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dialog.c    10 Jan 2003 12:25:32 -0000      1.7
+++ dialog.c    10 Jan 2003 15:02:15 -0000      1.8
@@ -132,11 +132,13 @@
 }
 
 GtkWidget * eb_menu_submenu (GtkMenu * menu, gchar * label,
-                            GtkWidget *submenu)
+                            GtkWidget *submenu, int nb)
 {
   GtkWidget * button;
   
   button = gtk_menu_item_new_with_label(label);
+  gtk_widget_set_sensitive(button, nb>0);
+         
   gtk_menu_append(GTK_MENU(menu), button);
 
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (button), submenu);

Index: dialog.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dialog.h    4 Jan 2003 13:59:27 -0000       1.3
+++ dialog.h    10 Jan 2003 15:02:15 -0000      1.4
@@ -97,7 +97,7 @@
                            gpointer callback_arg);
 
 GtkWidget * eb_menu_submenu (GtkMenu * menu, gchar * label,
-                            GtkWidget *submenu);
+                            GtkWidget *submenu, int nb);
 
 
 GtkWidget* do_error_dialog(char *message, char *title);

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- status.c    10 Jan 2003 12:38:20 -0000      1.14
+++ status.c    10 Jan 2003 15:02:15 -0000      1.15
@@ -266,7 +266,7 @@
   eb_local_account * el;
   //eb_account * ea = find_suitable_remote_account( NULL, conn );
 
-  if(ea) {
+  if(ea && RUN_SERVICE(ea)->get_info) {
       el = find_suitable_local_account(NULL, ea->service_id);
       RUN_SERVICE(ea)->get_info(el ,ea);  
   }  else {
@@ -307,7 +307,7 @@
 
 }
 
-static GtkWidget *make_info_menu(struct contact *c)
+static GtkWidget *make_info_menu(struct contact *c, int *nb)
 {
   GList *iterator;
   GtkWidget *InfoMenu = gtk_menu_new();
@@ -316,13 +316,14 @@
   for(iterator=c->accounts; iterator; iterator=iterator->next)
   {
     eb_account * account = (eb_account*)iterator->data;
-    if(account->online){
+    if(account->online && RUN_SERVICE(account)->get_info){
       buff = g_strdup_printf("%s [%s]", account->handle, 
get_service_name(account->service_id));           
       button = gtk_menu_item_new_with_label(buff);
       free(buff);
       gtk_signal_connect(GTK_OBJECT(button), "activate", 
GTK_SIGNAL_FUNC(get_info),account);
       gtk_menu_append(GTK_MENU(InfoMenu), button);
       gtk_widget_show(button);
+      (*nb)++;
     }
   }
   return InfoMenu;
@@ -338,15 +339,15 @@
   
   menu = gtk_menu_new();
   
-  eb_menu_button (GTK_MENU(menu), _("Add contact to group"),
+  eb_menu_button (GTK_MENU(menu), _("Add contact to group..."),
                  GTK_SIGNAL_FUNC(add_to_group_callback), d);
 
   eb_menu_button (GTK_MENU(menu), NULL, NULL, NULL);
 
-  eb_menu_button (GTK_MENU(menu), _("Edit Group"),
+  eb_menu_button (GTK_MENU(menu), _("Edit Group..."),
                  GTK_SIGNAL_FUNC(edit_group_callback), d);
 
-  eb_menu_button (GTK_MENU(menu), _("Delete Group"),
+  eb_menu_button (GTK_MENU(menu), _("Delete Group..."),
                  GTK_SIGNAL_FUNC(offer_remove_group_callback), d);
   
   gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
@@ -361,7 +362,7 @@
   menu_item_data *mid=NULL;
   ebmContactData *ecd=NULL;
   GList *list=NULL;
-  
+  int nbitems = 0;
   menu = gtk_menu_new();
   
   eb_menu_button (GTK_MENU(menu), _("Add Account to Contact..."),
@@ -370,23 +371,28 @@
   eb_menu_button (GTK_MENU(menu), _("Edit Contact..."),
                  GTK_SIGNAL_FUNC(edit_contact_callback), d);
 
-  eb_menu_button (GTK_MENU(menu), _("Delete Contact"),
+  eb_menu_button (GTK_MENU(menu), _("Delete Contact..."),
                  GTK_SIGNAL_FUNC(offer_remove_contact_callback), d);
   
+  eb_menu_button (GTK_MENU(menu), NULL, NULL, NULL); /* sep */
+  
   eb_menu_button (GTK_MENU(menu), _("Send File..."),
                  GTK_SIGNAL_FUNC(send_file_with_contact_callback), d);
   
-  submenu = make_info_menu((struct contact *)d);
-  eb_menu_submenu (GTK_MENU(menu), _("Info"), submenu);
-
   eb_menu_button (GTK_MENU(menu), _("Edit Trigger..."),
                  GTK_SIGNAL_FUNC(edit_trigger_callback), d);
 
+  eb_menu_button (GTK_MENU(menu), NULL, NULL, NULL); /* sep */
+
+  eb_menu_button (GTK_MENU(menu), _("View Log..."),
+                 GTK_SIGNAL_FUNC(view_log_callback), d);
+
+  submenu = make_info_menu((struct contact *)d, &nbitems);
+  eb_menu_submenu (GTK_MENU(menu), _("Info"), submenu, nbitems);
+
   /*** MIZHI
    * code for viewing the logs
    */
-  eb_menu_button (GTK_MENU(menu), _("View Log..."),
-                 GTK_SIGNAL_FUNC(view_log_callback), d);
 
   md = GetPref(EB_CONTACT_MENU);
   if(md)
@@ -420,14 +426,15 @@
   eb_menu_button (GTK_MENU(menu), _("Edit Account..."),
                  GTK_SIGNAL_FUNC(edit_account_callback), d);
 
-  eb_menu_button (GTK_MENU(menu), _("Delete Account"),
+  eb_menu_button (GTK_MENU(menu), _("Delete Account..."),
                  GTK_SIGNAL_FUNC(offer_remove_account_callback), d);
 
+  eb_menu_button (GTK_MENU(menu), NULL, NULL, NULL); /* sep */
 
   eb_menu_button (GTK_MENU(menu), _("Send File..."),
                  GTK_SIGNAL_FUNC(send_file_callback), d);
 
-  eb_menu_button (GTK_MENU(menu), _("Info"),
+  eb_menu_button (GTK_MENU(menu), _("Info..."),
                  GTK_SIGNAL_FUNC(get_info),d);
 
   gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,