[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src/ui/gui ChangeLog psppire-case-file.c p...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp/src/ui/gui ChangeLog psppire-case-file.c p... |
|
Date: |
Fri, 12 Jan 2007 22:50:14 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/01/12 22:50:14
Modified files:
src/ui/gui : ChangeLog psppire-case-file.c
psppire-data-store.c psppire-dialog.c
psppire-dict.c psppire-var-select.c
Log message:
Changed instances of 'signal' to 'signals', to avoid conflicts
from /usr/include/signal.h
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dialog.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.c?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-var-select.c?cvsroot=pspp&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- ChangeLog 10 Jan 2007 09:22:42 -0000 1.36
+++ ChangeLog 12 Jan 2007 22:50:14 -0000 1.37
@@ -1,3 +1,11 @@
+Sat Jan 13 07:47:26 WST 2007 John Darrington <address@hidden>
+
+ * psppire-case-file.c psppire-data-store.c psppire-dialog.c
+ psppire-dict.c psppire-var-select.c : Replaced identifier 'signal'
+ with 'signals' to avoid conflict with sysv based systems which use
+ this identifer for something else.
+ Thanks to Daniel E WILLIAMS for reporting this problem.
+
Wed Jan 10 07:20:39 WST 2007 John Darrington <address@hidden>
* psppire-case-file.c : Make sure there is always a valid flexifile
Index: psppire-case-file.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- psppire-case-file.c 10 Jan 2007 09:22:42 -0000 1.15
+++ psppire-case-file.c 12 Jan 2007 22:50:14 -0000 1.16
@@ -48,7 +48,7 @@
CASES_DELETED,
n_SIGNALS};
-static guint signal[n_SIGNALS];
+static guint signals [n_SIGNALS];
/* --- functions --- */
@@ -92,7 +92,7 @@
object_class->finalize = psppire_case_file_finalize;
- signal[CASE_CHANGED] =
+ signals [CASE_CHANGED] =
g_signal_new ("case_changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -104,7 +104,7 @@
G_TYPE_INT);
- signal[CASE_INSERTED] =
+ signals [CASE_INSERTED] =
g_signal_new ("case_inserted",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -116,7 +116,7 @@
G_TYPE_INT);
- signal[CASES_DELETED] =
+ signals [CASES_DELETED] =
g_signal_new ("cases_deleted",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -181,7 +181,7 @@
result = flexifile_delete_cases (FLEXIFILE (cf->flexifile), n_cases,
first);
- g_signal_emit (cf, signal[CASES_DELETED], 0, n_cases, first);
+ g_signal_emit (cf, signals [CASES_DELETED], 0, n_cases, first);
return result;
}
@@ -200,7 +200,7 @@
result = flexifile_insert_case (FLEXIFILE (cf->flexifile), cc, posn);
if ( result )
- g_signal_emit (cf, signal[CASE_INSERTED], 0, posn);
+ g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
else
g_warning ("Cannot insert case at position %d\n", posn);
@@ -223,7 +223,7 @@
result = casefile_append (cf->flexifile, c);
- g_signal_emit (cf, signal[CASE_INSERTED], 0, posn);
+ g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
return result;
}
@@ -267,7 +267,7 @@
{
casefile_destroy (cf->flexifile);
cf->flexifile = 0;
- g_signal_emit (cf, signal[CASES_DELETED], 0, 0, -1);
+ g_signal_emit (cf, signals [CASES_DELETED], 0, 0, -1);
}
/* Set the IDXth value of case C to SYSMIS/EMPTY */
@@ -294,7 +294,7 @@
/* Cast away const in flagrant abuse of the casefile */
memcpy ((union value *)case_data_idx (&cc, idx), v, bytes);
- g_signal_emit (cf, signal[CASE_CHANGED], 0, casenum);
+ g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum);
return TRUE;
}
@@ -321,7 +321,7 @@
(union value *) case_data_idx (&cc, idx), fmt_var_width (fmt)))
g_warning ("Cant set value\n");
- g_signal_emit (cf, signal[CASE_CHANGED], 0, casenum);
+ g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum);
return TRUE;
}
@@ -346,7 +346,7 @@
/* FIXME: Need to have a signal to change a range of cases, instead of
calling a signal many times */
for ( c = 0 ; c < casefile_get_case_cnt (cf->flexifile) ; ++c )
- g_signal_emit (cf, signal[CASE_CHANGED], 0, c);
+ g_signal_emit (cf, signals [CASE_CHANGED], 0, c);
flexifile_factory_destroy (factory);
}
Index: psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- psppire-data-store.c 10 Jan 2007 09:22:42 -0000 1.32
+++ psppire-data-store.c 12 Jan 2007 22:50:14 -0000 1.33
@@ -77,7 +77,7 @@
enum {FONT_CHANGED,
n_SIGNALS};
-static guint signal[n_SIGNALS];
+static guint signals [n_SIGNALS];
inline GType
@@ -152,7 +152,7 @@
object_class->finalize = psppire_data_store_finalize;
- signal[FONT_CHANGED] =
+ signals [FONT_CHANGED] =
g_signal_new ("font_changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -614,7 +614,7 @@
#if 0
store->width_of_m = calc_m_width (fd);
#endif
- g_signal_emit (store, signal[FONT_CHANGED], 0);
+ g_signal_emit (store, signals [FONT_CHANGED], 0);
g_sheet_model_range_changed (G_SHEET_MODEL (store),
Index: psppire-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- psppire-dialog.c 4 Jan 2007 08:15:27 -0000 1.1
+++ psppire-dialog.c 12 Jan 2007 22:50:14 -0000 1.2
@@ -29,7 +29,7 @@
enum {DIALOG_REFRESH,
n_SIGNALS};
-static guint signal [n_SIGNALS];
+static guint signals [n_SIGNALS];
GType
@@ -84,7 +84,7 @@
{
GObjectClass *object_class = (GObjectClass *) class;
- signal [DIALOG_REFRESH] =
+ signals [DIALOG_REFRESH] =
g_signal_new ("refresh",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -167,5 +167,5 @@
void
psppire_dialog_reload (PsppireDialog *dialog, gpointer data)
{
- g_signal_emit (dialog, signal [DIALOG_REFRESH], 0, data);
+ g_signal_emit (dialog, signals [DIALOG_REFRESH], 0, data);
}
Index: psppire-dict.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- psppire-dict.c 7 Jan 2007 04:04:00 -0000 1.23
+++ psppire-dict.c 12 Jan 2007 22:50:14 -0000 1.24
@@ -54,7 +54,7 @@
SPLIT_CHANGED,
n_SIGNALS};
-static guint signal[n_SIGNALS];
+static guint signals [n_SIGNALS];
/* --- functions --- */
/**
@@ -109,7 +109,7 @@
object_class->finalize = psppire_dict_finalize;
- signal[VARIABLE_CHANGED] =
+ signals [VARIABLE_CHANGED] =
g_signal_new ("variable_changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -122,7 +122,7 @@
- signal[VARIABLE_INSERTED] =
+ signals [VARIABLE_INSERTED] =
g_signal_new ("variable_inserted",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -134,7 +134,7 @@
G_TYPE_INT);
- signal[VARIABLES_DELETED] =
+ signals [VARIABLES_DELETED] =
g_signal_new ("variables_deleted",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -147,7 +147,7 @@
G_TYPE_INT);
- signal[VARIABLE_RESIZED] =
+ signals [VARIABLE_RESIZED] =
g_signal_new ("dict-size-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -160,7 +160,7 @@
G_TYPE_INT);
- signal [WEIGHT_CHANGED] =
+ signals [WEIGHT_CHANGED] =
g_signal_new ("weight-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -172,7 +172,7 @@
G_TYPE_INT);
- signal [FILTER_CHANGED] =
+ signals [FILTER_CHANGED] =
g_signal_new ("filter-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -184,7 +184,7 @@
G_TYPE_INT);
- signal [SPLIT_CHANGED] =
+ signals [SPLIT_CHANGED] =
g_signal_new ("split-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -210,37 +210,37 @@
static void
addcb (struct dictionary *d, int idx, void *pd)
{
- g_signal_emit (pd, signal[VARIABLE_INSERTED], 0, idx);
+ g_signal_emit (pd, signals [VARIABLE_INSERTED], 0, idx);
}
static void
delcb (struct dictionary *d, int idx, void *pd)
{
- g_signal_emit (pd, signal[VARIABLES_DELETED], 0, idx, 1);
+ g_signal_emit (pd, signals [VARIABLES_DELETED], 0, idx, 1);
}
static void
mutcb (struct dictionary *d, int idx, void *pd)
{
- g_signal_emit (pd, signal[VARIABLE_CHANGED], 0, idx);
+ g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx);
}
static void
weight_changed_callback (struct dictionary *d, int idx, void *pd)
{
- g_signal_emit (pd, signal [WEIGHT_CHANGED], 0, idx);
+ g_signal_emit (pd, signals [WEIGHT_CHANGED], 0, idx);
}
static void
filter_changed_callback (struct dictionary *d, int idx, void *pd)
{
- g_signal_emit (pd, signal [FILTER_CHANGED], 0, idx);
+ g_signal_emit (pd, signals [FILTER_CHANGED], 0, idx);
}
static void
split_changed_callback (struct dictionary *d, void *pd)
{
- g_signal_emit (pd, signal [SPLIT_CHANGED], 0);
+ g_signal_emit (pd, signals [SPLIT_CHANGED], 0);
}
@@ -460,7 +460,7 @@
fv = var_get_case_index (pv);
- g_signal_emit (d, signal[VARIABLE_RESIZED], 0,
+ g_signal_emit (d, signals [VARIABLE_RESIZED], 0,
fv + old_size,
new_size - old_size );
}
Index: psppire-var-select.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-var-select.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- psppire-var-select.c 4 Jan 2007 08:15:27 -0000 1.1
+++ psppire-var-select.c 12 Jan 2007 22:50:14 -0000 1.2
@@ -56,7 +56,7 @@
DESELECT_ALL,
n_SIGNALS};
-static guint signal[n_SIGNALS];
+static guint signals [n_SIGNALS];
/* --- variables --- */
@@ -103,7 +103,7 @@
parent_class = g_type_class_peek_parent (class);
- signal [VARIABLE_SELECTED] =
+ signals [VARIABLE_SELECTED] =
g_signal_new ("variable_selected",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -115,7 +115,7 @@
G_TYPE_INT);
- signal [DESELECT_ALL] =
+ signals [DESELECT_ALL] =
g_signal_new ("deselect_all",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
@@ -165,7 +165,7 @@
}
vs->list = g_list_append (vs->list, var);
- g_signal_emit (vs, signal [VARIABLE_SELECTED], 0, var_get_dict_index (var));
+ g_signal_emit (vs, signals [VARIABLE_SELECTED], 0, var_get_dict_index (var));
}
@@ -249,7 +249,7 @@
gtk_entry_set_text ( GTK_ENTRY(vs->dest), "");
- g_signal_emit (vs, signal [DESELECT_ALL], 0);
+ g_signal_emit (vs, signals [DESELECT_ALL], 0);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src/ui/gui ChangeLog psppire-case-file.c p...,
John Darrington <=