[med-svn] [aghermann] 24/60: rename *SFAD{Cancel->Dismiss}*

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit 677b1bcd4a027347f94ac5fcaef3168890a60dca
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Oct 13 23:58:27 2013 +0300

    rename *SFAD{Cancel->Dismiss}*
---
 upstream/src/aghermann/ui/sf/d/artifacts.cc    |    4 ++--
 upstream/src/aghermann/ui/sf/d/artifacts.hh    |    4 ++--
 upstream/src/aghermann/ui/sf/d/artifacts_cb.cc |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/upstream/src/aghermann/ui/sf/d/artifacts.cc b/upstream/src/aghermann/ui/sf/d/artifacts.cc
index e39e4d7..eab7bb6 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts.cc
@@ -67,7 +67,7 @@ SArtifactsDialog (SScoringFacility& p_)
         AGH_GBGETOBJ (lSFADDirtyPercent);
         AGH_GBGETOBJ (bSFADPreview);
         AGH_GBGETOBJ (bSFADApply);
-        AGH_GBGETOBJ (bSFADCancel);
+        AGH_GBGETOBJ (bSFADDismiss);
 
         AGH_GBGETOBJ (eSFADProfileList);
         AGH_GBGETOBJ (bSFADProfileSave);
@@ -115,7 +115,7 @@ SArtifactsDialog (SScoringFacility& p_)
 
         G_CONNECT_1 (bSFADPreview, toggled);
         G_CONNECT_1 (bSFADApply, clicked);
-        G_CONNECT_1 (bSFADCancel, clicked);
+        G_CONNECT_1 (bSFADDismiss, clicked);
 
         for ( auto& W : {eSFADProfileSaveOriginUser, eSFADProfileSaveOriginExperiment, eSFADProfileSaveOriginSubject} )
                 g_signal_connect(
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts.hh b/upstream/src/aghermann/ui/sf/d/artifacts.hh
index 7cda6e5..bec5ec6 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts.hh
+++ b/upstream/src/aghermann/ui/sf/d/artifacts.hh
@@ -94,7 +94,7 @@ struct SScoringFacility::SArtifactsDialog
                 *bSFADPreview;
         GtkButton
                 *bSFADApply,
-                *bSFADCancel;
+                *bSFADDismiss;
 
         GtkDialog
                 *wSFADProfileSave;
@@ -129,7 +129,7 @@ void eSFADEstimateE_toggled_cb( GtkToggleButton*, gpointer);
 void eSFADUseThisRange_toggled_cb( GtkToggleButton*, gpointer);
 void bSFADPreview_toggled_cb( GtkToggleButton*, gpointer);
 void bSFADApply_clicked_cb( GtkButton*, gpointer);
-void bSFADCancel_clicked_cb( GtkButton*, gpointer);
+void bSFADDismiss_clicked_cb( GtkButton*, gpointer);
 }
 
 #endif
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc b/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
index fffb6ae..9436466 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
@@ -64,7 +64,7 @@ wSFAD_delete_event_cb(
         GdkEvent*,
         const gpointer userdata)
 {
-        bSFADCancel_clicked_cb( NULL, userdata);
+        bSFADDismiss_clicked_cb( NULL, userdata);
         return TRUE;
 }
 
@@ -73,7 +73,7 @@ wSFAD_close_cb(
         GtkWidget*,
         const gpointer userdata)
 {
-        bSFADCancel_clicked_cb( NULL, userdata);
+        bSFADDismiss_clicked_cb( NULL, userdata);
 }
 
 
@@ -143,7 +143,7 @@ bSFADApply_clicked_cb(
 }
 
 void
-bSFADCancel_clicked_cb(
+bSFADDismiss_clicked_cb(
         GtkButton*,
         const gpointer userdata)
 {

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git