Re: [patch 15/19] the big patch

[John Darrington]

The changes to src/ui/gui/var-sheet.c are reverting an earlier
portability patch.    There should be no changes needed to this file.

J'


On Tue, Jun 05, 2007 at 11:27:42PM -0700, address@hidden wrote:
     Most of the patches up to this point have been creating infrastructure
     for the new procedure code.  This patch actually implements the new
     procedure code and adapts all of its clients to match.  It also adapts
     all of the other case sources and sinks in the tree and their clients
     to use the casereader/casewriter infrastructure.
     
     The files removed from src/data/automake.mk would also be removed from
     CVS when this patch is checked in.
      
     Index: merge/src/ui/gui/var-sheet.c
     ===================================================================
     --- merge.orig/src/ui/gui/var-sheet.c      2007-06-05 09:16:11.000000000 
-0700
     +++ merge/src/ui/gui/var-sheet.c   2007-06-05 09:18:06.000000000 -0700
     @@ -33,6 +33,9 @@
      
      #include <stdlib.h>
      #include <string.h>
     +#if HAVE_LANGINFO_H
     +#include <langinfo.h>
     +#endif
      
      #include <data/value.h>
      
     @@ -40,7 +43,6 @@
      #include <gtksheet/gsheet-hetero-column.h>
      #include <gtksheet/gsheet-uniform-row.h>
      
     -#include "localcharset.h"
      #include "psppire-var-store.h"
      #include "helper.h"
      #include "psppire-dict.h"
     @@ -416,7 +418,9 @@
                               gchar *string2,
                               gint int1, gint int2)
      {
     +#if HAVE_LANGINFO_H
        gchar *codeset;
     +#endif
        gint i;
        GtkWidget *sheet;
      
     @@ -444,11 +448,12 @@
        gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_var_store));
      
      
     +#if HAVE_LANGINFO_H
        /* Since this happens inside glade_xml_new, we must prevent strings from
         * being re-encoded twice */
        codeset = bind_textdomain_codeset (PACKAGE, 0);
     -  bind_textdomain_codeset (PACKAGE, locale_charset ());
     -
     +  bind_textdomain_codeset (PACKAGE, nl_langinfo (CODESET));
     +#endif
        for (i = 0 ; i < n_COLS ; ++i )
          {
            g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN 
(geo), i,
     @@ -457,8 +462,9 @@
            g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
                                               column_def[i].width);
          }
     -
     +#if HAVE_LANGINFO_H
        bind_textdomain_codeset (PACKAGE, codeset);
     +#endif
      
        gtk_widget_show (sheet);
      

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.

signature.asc
Description: Digital signature