summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGene Z. Ragan <gzr@eazel.com>2000-08-23 22:58:16 +0000
committerGene Ragan <gzr@src.gnome.org>2000-08-23 22:58:16 +0000
commit411616b660aafe6d8357441abb4ac8f6a22d8581 (patch)
tree3d1182f146e110a896163889050c677ee6750619
parentb4a2d9bf9522ffaa82b276cdae5bdb148bebf4cc (diff)
downloadnautilus-411616b660aafe6d8357441abb4ac8f6a22d8581.tar.gz
Rename functions to be verb phrases as opposed to nouns.
2000-08-23 Gene Z. Ragan <gzr@eazel.com> * libnautilus-extensions/nautilus-undo-signal-handlers.c: * libnautilus-extensions/nautilus-undo-signal-handlers.h: (nautilus_undo_set_up_nautilus_entry_for_undo), (nautilus_undo_tear_down_nautilus_entry_for_undo), (nautilus_undo_set_up_editable_for_undo), (nautilus_undo_tear_down_editable_for_undo): Rename functions to be verb phrases as opposed to nouns. * components/notes/nautilus-notes.c: (finish_loading_note), (notes_load_location), (make_notes_view): Rename functions to use new names above. * libnautilus-extensions/nautilus-entry.c: (nautilus_entry_initialize): Rename functions to use new names above. * src/file-manager/fm-properties-window.c: (create_basic_page): Rename functions to use new names above.
-rw-r--r--ChangeLog21
-rw-r--r--components/notes/nautilus-notes.c6
-rw-r--r--libnautilus-extensions/nautilus-entry.c2
-rw-r--r--libnautilus-extensions/nautilus-undo-signal-handlers.c12
-rw-r--r--libnautilus-extensions/nautilus-undo-signal-handlers.h8
-rw-r--r--libnautilus-private/nautilus-entry.c2
-rw-r--r--libnautilus-private/nautilus-undo-signal-handlers.c12
-rw-r--r--libnautilus-private/nautilus-undo-signal-handlers.h8
-rw-r--r--src/file-manager/fm-properties-window.c2
9 files changed, 47 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index a288427b2..3be190521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,27 @@
2000-08-23 Gene Z. Ragan <gzr@eazel.com>
* libnautilus-extensions/nautilus-undo-signal-handlers.c:
+ * libnautilus-extensions/nautilus-undo-signal-handlers.h:
+ (nautilus_undo_set_up_nautilus_entry_for_undo),
+ (nautilus_undo_tear_down_nautilus_entry_for_undo),
+ (nautilus_undo_set_up_editable_for_undo),
+ (nautilus_undo_tear_down_editable_for_undo):
+ Rename functions to be verb phrases as opposed to nouns.
+
+ * components/notes/nautilus-notes.c: (finish_loading_note),
+ (notes_load_location), (make_notes_view):
+ Rename functions to use new names above.
+
+ * libnautilus-extensions/nautilus-entry.c:
+ (nautilus_entry_initialize):
+ Rename functions to use new names above.
+
+ * src/file-manager/fm-properties-window.c: (create_basic_page):
+ Rename functions to use new names above.
+
+2000-08-23 Gene Z. Ragan <gzr@eazel.com>
+
+ * libnautilus-extensions/nautilus-undo-signal-handlers.c:
(nautilus_undo_teardown_nautilus_entry_for_undo),
(nautilus_undo_teardown_editable_for_undo):
Adding the call to unregister form the undo manager was not such
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 6fd1657d0..f0fb868e7 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -73,7 +73,7 @@ finish_loading_note (NautilusFile *file,
&position);
g_free (notes_text);
- nautilus_undo_setup_editable_for_undo (GTK_EDITABLE (notes->note_text_field));
+ nautilus_undo_set_up_editable_for_undo (GTK_EDITABLE (notes->note_text_field));
}
static void
@@ -118,7 +118,7 @@ notes_load_location (NautilusView *view,
Notes *notes)
{
if (strcmp (notes->uri, location) != 0) {
- nautilus_undo_teardown_editable_for_undo (GTK_EDITABLE (notes->note_text_field));
+ nautilus_undo_tear_down_editable_for_undo (GTK_EDITABLE (notes->note_text_field));
notes_save_metainfo (notes);
g_free (notes->uri);
notes->uri = g_strdup (location);
@@ -180,7 +180,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
nautilus_view_get_bonobo_control (notes->view));
/* Setup up text field for undo */
- nautilus_undo_setup_editable_for_undo (GTK_EDITABLE (notes->note_text_field));
+ nautilus_undo_set_up_editable_for_undo (GTK_EDITABLE (notes->note_text_field));
nautilus_undo_editable_set_undo_key (GTK_EDITABLE (notes->note_text_field), TRUE);
return BONOBO_OBJECT (notes->view);
diff --git a/libnautilus-extensions/nautilus-entry.c b/libnautilus-extensions/nautilus-entry.c
index c3557ed2d..c87a61699 100644
--- a/libnautilus-extensions/nautilus-entry.c
+++ b/libnautilus-extensions/nautilus-entry.c
@@ -98,7 +98,7 @@ nautilus_entry_initialize (NautilusEntry *entry)
{
entry->user_edit = TRUE;
- nautilus_undo_setup_nautilus_entry_for_undo (entry);
+ nautilus_undo_set_up_nautilus_entry_for_undo (entry);
}
GtkWidget*
diff --git a/libnautilus-extensions/nautilus-undo-signal-handlers.c b/libnautilus-extensions/nautilus-undo-signal-handlers.c
index 856068636..9884138cb 100644
--- a/libnautilus-extensions/nautilus-undo-signal-handlers.c
+++ b/libnautilus-extensions/nautilus-undo-signal-handlers.c
@@ -52,7 +52,7 @@ static void restore_editable_from_undo_snapshot_callback (GtkObject *target,
static void editable_register_edit_undo (GtkEditable *editable);
static void free_editable_object_data (gpointer data);
-/* nautilus_undo_setup_nautilus_entry_for_undo
+/* nautilus_undo_set_up_nautilus_entry_for_undo
*
* Functions and callback methods to handle undo
* in a NautilusEntry
@@ -66,7 +66,7 @@ nautilus_entry_user_changed_callback (NautilusEntry *entry)
}
void
-nautilus_undo_setup_nautilus_entry_for_undo (NautilusEntry *entry)
+nautilus_undo_set_up_nautilus_entry_for_undo (NautilusEntry *entry)
{
EditableUndoObjectData *data;
@@ -87,7 +87,7 @@ nautilus_undo_setup_nautilus_entry_for_undo (NautilusEntry *entry)
}
void
-nautilus_undo_teardown_nautilus_entry_for_undo (NautilusEntry *entry)
+nautilus_undo_tear_down_nautilus_entry_for_undo (NautilusEntry *entry)
{
if (!NAUTILUS_IS_ENTRY (entry) ) {
return;
@@ -100,7 +100,7 @@ nautilus_undo_teardown_nautilus_entry_for_undo (NautilusEntry *entry)
}
-/* nautilus_undo_setup_nautilus_entry_for_undo
+/* nautilus_undo_set_up_nautilus_entry_for_undo
*
* Functions and callback methods to handle undo
* in a NautilusEntry
@@ -182,7 +182,7 @@ editable_register_edit_undo (GtkEditable *editable)
}
void
-nautilus_undo_setup_editable_for_undo (GtkEditable *editable)
+nautilus_undo_set_up_editable_for_undo (GtkEditable *editable)
{
EditableUndoObjectData *data;
@@ -209,7 +209,7 @@ nautilus_undo_setup_editable_for_undo (GtkEditable *editable)
}
void
-nautilus_undo_teardown_editable_for_undo (GtkEditable *editable)
+nautilus_undo_tear_down_editable_for_undo (GtkEditable *editable)
{
if (!GTK_IS_EDITABLE (editable) ) {
return;
diff --git a/libnautilus-extensions/nautilus-undo-signal-handlers.h b/libnautilus-extensions/nautilus-undo-signal-handlers.h
index e00ceb05a..68663d088 100644
--- a/libnautilus-extensions/nautilus-undo-signal-handlers.h
+++ b/libnautilus-extensions/nautilus-undo-signal-handlers.h
@@ -27,10 +27,10 @@
#include <libnautilus-extensions/nautilus-entry.h>
-void nautilus_undo_setup_nautilus_entry_for_undo (NautilusEntry *entry);
-void nautilus_undo_teardown_nautilus_entry_for_undo (NautilusEntry *entry);
-void nautilus_undo_setup_editable_for_undo (GtkEditable *editable);
-void nautilus_undo_teardown_editable_for_undo (GtkEditable *editable);
+void nautilus_undo_set_up_nautilus_entry_for_undo (NautilusEntry *entry);
+void nautilus_undo_tear_down_nautilus_entry_for_undo (NautilusEntry *entry);
+void nautilus_undo_set_up_editable_for_undo (GtkEditable *editable);
+void nautilus_undo_tear_down_editable_for_undo (GtkEditable *editable);
void nautilus_undo_editable_set_undo_key (GtkEditable *editable,
gboolean value);
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index c3557ed2d..c87a61699 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -98,7 +98,7 @@ nautilus_entry_initialize (NautilusEntry *entry)
{
entry->user_edit = TRUE;
- nautilus_undo_setup_nautilus_entry_for_undo (entry);
+ nautilus_undo_set_up_nautilus_entry_for_undo (entry);
}
GtkWidget*
diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c
index 856068636..9884138cb 100644
--- a/libnautilus-private/nautilus-undo-signal-handlers.c
+++ b/libnautilus-private/nautilus-undo-signal-handlers.c
@@ -52,7 +52,7 @@ static void restore_editable_from_undo_snapshot_callback (GtkObject *target,
static void editable_register_edit_undo (GtkEditable *editable);
static void free_editable_object_data (gpointer data);
-/* nautilus_undo_setup_nautilus_entry_for_undo
+/* nautilus_undo_set_up_nautilus_entry_for_undo
*
* Functions and callback methods to handle undo
* in a NautilusEntry
@@ -66,7 +66,7 @@ nautilus_entry_user_changed_callback (NautilusEntry *entry)
}
void
-nautilus_undo_setup_nautilus_entry_for_undo (NautilusEntry *entry)
+nautilus_undo_set_up_nautilus_entry_for_undo (NautilusEntry *entry)
{
EditableUndoObjectData *data;
@@ -87,7 +87,7 @@ nautilus_undo_setup_nautilus_entry_for_undo (NautilusEntry *entry)
}
void
-nautilus_undo_teardown_nautilus_entry_for_undo (NautilusEntry *entry)
+nautilus_undo_tear_down_nautilus_entry_for_undo (NautilusEntry *entry)
{
if (!NAUTILUS_IS_ENTRY (entry) ) {
return;
@@ -100,7 +100,7 @@ nautilus_undo_teardown_nautilus_entry_for_undo (NautilusEntry *entry)
}
-/* nautilus_undo_setup_nautilus_entry_for_undo
+/* nautilus_undo_set_up_nautilus_entry_for_undo
*
* Functions and callback methods to handle undo
* in a NautilusEntry
@@ -182,7 +182,7 @@ editable_register_edit_undo (GtkEditable *editable)
}
void
-nautilus_undo_setup_editable_for_undo (GtkEditable *editable)
+nautilus_undo_set_up_editable_for_undo (GtkEditable *editable)
{
EditableUndoObjectData *data;
@@ -209,7 +209,7 @@ nautilus_undo_setup_editable_for_undo (GtkEditable *editable)
}
void
-nautilus_undo_teardown_editable_for_undo (GtkEditable *editable)
+nautilus_undo_tear_down_editable_for_undo (GtkEditable *editable)
{
if (!GTK_IS_EDITABLE (editable) ) {
return;
diff --git a/libnautilus-private/nautilus-undo-signal-handlers.h b/libnautilus-private/nautilus-undo-signal-handlers.h
index e00ceb05a..68663d088 100644
--- a/libnautilus-private/nautilus-undo-signal-handlers.h
+++ b/libnautilus-private/nautilus-undo-signal-handlers.h
@@ -27,10 +27,10 @@
#include <libnautilus-extensions/nautilus-entry.h>
-void nautilus_undo_setup_nautilus_entry_for_undo (NautilusEntry *entry);
-void nautilus_undo_teardown_nautilus_entry_for_undo (NautilusEntry *entry);
-void nautilus_undo_setup_editable_for_undo (GtkEditable *editable);
-void nautilus_undo_teardown_editable_for_undo (GtkEditable *editable);
+void nautilus_undo_set_up_nautilus_entry_for_undo (NautilusEntry *entry);
+void nautilus_undo_tear_down_nautilus_entry_for_undo (NautilusEntry *entry);
+void nautilus_undo_set_up_editable_for_undo (GtkEditable *editable);
+void nautilus_undo_tear_down_editable_for_undo (GtkEditable *editable);
void nautilus_undo_editable_set_undo_key (GtkEditable *editable,
gboolean value);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index acbee1cf0..414970855 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -1095,7 +1095,7 @@ create_basic_page (GtkNotebook *notebook, NautilusFile *file)
name_field_update_to_match_file (NAUTILUS_ENTRY (name_field));
/* Set up name field for undo */
- nautilus_undo_setup_nautilus_entry_for_undo ( NAUTILUS_ENTRY (name_field));
+ nautilus_undo_set_up_nautilus_entry_for_undo ( NAUTILUS_ENTRY (name_field));
nautilus_undo_editable_set_undo_key (GTK_EDITABLE (name_field), TRUE);
gtk_signal_connect (GTK_OBJECT (name_field), "focus_in_event",