Removed signal emissions from psppire-dict.c

diff --git a/po/de.po b/po/de.po
index 61d10a987a78daf961178ab4dfd92f27f87d7226..b593393d49e27fde5428ff5e4e53e014cb4d4cfd 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2006-12-25 07:26+0900\n"
+"POT-Creation-Date: 2006-12-25 11:19+0900\n"
 "PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
@@ -4388,19 +4388,19 @@ msgstr ""
 msgid "Sort by:"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:123
+#: src/ui/gui/message-dialog.c:122
 msgid "Script Error"
 msgstr "Skript Fehler"
 
-#: src/ui/gui/message-dialog.c:127
+#: src/ui/gui/message-dialog.c:126
 msgid "Data File Error"
 msgstr "Datei Fehler"
 
-#: src/ui/gui/message-dialog.c:132
+#: src/ui/gui/message-dialog.c:131
 msgid "PSPP Error"
 msgstr "PSPP Fehler"
 
-#: src/ui/gui/message-dialog.c:143
+#: src/ui/gui/message-dialog.c:142
 #, c-format
 msgid "%s (line %d) %s"
 msgstr ""

diff --git a/po/pspp.pot b/po/pspp.pot
index 9e48be69b35e7a84e3f5edba300e236b8cf024fb..36de4f537e5c1b2ead9a36568437a53a674d0fe7 100644 (file)
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2006-12-25 07:26+0900\n"
+"POT-Creation-Date: 2006-12-25 11:19+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4375,19 +4375,19 @@ msgstr ""
 msgid "Sort by:"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:123
+#: src/ui/gui/message-dialog.c:122
 msgid "Script Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:127
+#: src/ui/gui/message-dialog.c:126
 msgid "Data File Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:132
+#: src/ui/gui/message-dialog.c:131
 msgid "PSPP Error"
 msgstr ""
 
-#: src/ui/gui/message-dialog.c:143
+#: src/ui/gui/message-dialog.c:142
 #, c-format
 msgid "%s (line %d) %s"
 msgstr ""

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index 6aabf006e31a3f58cf84ae82a8fab340adf48dda..7297a9a6f1af76ada17226fda1eb14a08380a166 100644 (file)
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 25 11:28:29 WST 2006 John Darrington <john@darrington.wattle.id.au>
+
+       * psppire-dict.c psppire-dict.h: Removed explicit signal emit calls.
+       These are not required, now that src/data/dictionary.c has callbacks
+
 Mon Dec 25 08:49:57 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
        * var-sheet.c val-labs-dialog.c val-labs-dialog.h: Fixed bug in value

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 5cf2f4faafc78de385dfd1bd67ae69a35b77ee6c..15a3deff0c995f730d53290cac2b671287fe3a76 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -253,8 +253,6 @@ psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name)
   var = dict_create_var (d->dict, name, 0);
 
   dict_reorder_var (d->dict, var, idx);
-
-  g_signal_emit (d, signal[VARIABLE_INSERTED], 0, idx );
 }
 
 /* Delete N variables beginning at FIRST */
@@ -278,8 +276,6 @@ psppire_dict_delete_variables (PsppireDict *d, gint first, gint n)
       dict_delete_var (d->dict, var);
     }
   dict_compact_values (d->dict);
-
-  g_signal_emit (d, signal[VARIABLES_DELETED], 0, first, idx );
 }
 
 
@@ -296,13 +292,11 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
       /* This is an existing variable? */
       var = dict_get_var (d->dict, idx);
       dict_rename_var (d->dict, var, name);
-      g_signal_emit (d, signal[VARIABLE_CHANGED], 0, idx);
     }
   else
     {
       /* new variable */
       dict_create_var (d->dict, name, 0);
-      g_signal_emit (d, signal[VARIABLE_INSERTED], 0, idx);
     }
 }
 
@@ -346,15 +340,6 @@ psppire_dict_lookup_var (const PsppireDict *d, const gchar *name)
 }
 
 
-void
-psppire_dict_var_changed (PsppireDict *d, gint idx)
-{
-  g_return_if_fail (d);
-
-  g_signal_emit (d, signal[VARIABLE_CHANGED], 0, idx);
-}
-
-
 /* Clears the contents of D */
 void
 psppire_dict_clear (PsppireDict *d)
@@ -366,8 +351,6 @@ psppire_dict_clear (PsppireDict *d)
     const gint n_vars = dict_get_var_cnt (d->dict);
 
     dict_clear (d->dict);
-
-    g_signal_emit (d, signal[VARIABLES_DELETED], 0, 0, n_vars );
   }
 }
 

diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h
index 60d52cde9d3831c9cf2b8aa7437c1343da61ff1f..044cbd25ac53bc4a7ab0002eedca007e1fe19091 100644 (file)
--- a/src/ui/gui/psppire-dict.h
+++ b/src/ui/gui/psppire-dict.h
@@ -78,15 +78,10 @@ gint psppire_dict_get_var_cnt (const PsppireDict *d);
 */
 struct variable * psppire_dict_lookup_var (const PsppireDict *d, const gchar *name);
 
-/* Tell the dictionary that one of its variable has changed */
-void psppire_dict_var_changed (PsppireDict *d, gint idx);
-
-
 /* Clears the contents of D */
 void psppire_dict_clear (PsppireDict *d);
 
 /* Return the IDXth variable */
-
 struct variable * psppire_dict_get_variable (PsppireDict *d, gint idx);
 
 /* Delete N variables beginning at FIRST */