gEDA-cvs: CVS update: x_menus.c

[cvspsrv@xxxxxxxx]

  User: ahvezda 
  Date: 06/07/26 21:59:19

  Modified:    .        x_menus.c x_window.c
  Log:
  Fixed pro-active pointer check to be an assert and applied --disable-nls fix
  
  patch by Gabriel Paubert
  
  
  
  
  Revision  Changes    Path
  1.37      +8 -2      eda/geda/gaf/gschem/src/x_menus.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: x_menus.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_menus.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- x_menus.c	15 Jul 2006 18:51:41 -0000	1.36
  +++ x_menus.c	27 Jul 2006 01:59:19 -0000	1.37
  @@ -102,7 +102,7 @@
     char *menu_item_hotkey_func;
     char *menu_item_keys;
     char *spaces;
  -  char *help_string;
  +  const char *help_string;
     int i, j;
     int name_len, key_len, pad;
     int sum, diff, max_size, space_size;
  @@ -264,6 +264,12 @@
    *  \par Function Description
    *
    */
  +static gchar* gettext_fn(const gchar *path,
  +			 gpointer func_data __attribute__((unused)))
  +{
  +	return gettext(path);
  +}
  +
   GtkWidget *get_main_popup(TOPLEVEL *w_current)
   {
     static GtkItemFactory *item_factory;
  @@ -281,7 +287,7 @@
     item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<popup>",
                                         accel_group);
     gtk_item_factory_set_translate_func (item_factory,
  -                                       (GtkTranslateFunc)gettext,
  +                                       gettext_fn,
                                          NULL, NULL);
     /* This function creates the pop-up menu itself & attaches it to the
        GtkItemFactory. Pass the item factory,
  
  
  
  1.32      +2 -2      eda/geda/gaf/gschem/src/x_window.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: x_window.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_window.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- x_window.c	25 Jul 2006 00:54:34 -0000	1.31
  +++ x_window.c	27 Jul 2006 01:59:19 -0000	1.32
  @@ -994,8 +994,8 @@
     x_fileselect_free_list_buffers(&w_current->fileselect[FILESELECT]);
     x_fileselect_free_list_buffers(&w_current->fileselect[COMPSELECT]);
   
  -  if (w_current->next == NULL && w_current->prev != NULL && 
  -      w_current->prev->prev == NULL) {
  +  g_assert(w_current->prev != NULL);
  +  if (w_current->next == NULL && w_current->prev->prev == NULL) {
       /* no more window after this one, remember to quit */
       last_window = TRUE;
     }
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs