IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Register2: Minor code cleanup: Rename moved_cb to uiupdate_cb. Refactor common sanity check into extra function.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23060 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming
2013-06-20 20:44:43 +00:00
parent a8516187b7
commit db8a08a3d0
3 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gnome-utils/gnc-tree-view-split-reg.c
+23 -19
View File
@@ -981,8 +981,7 @@ gnc_tree_view_split_reg_set_format (GncTreeViewSplitReg *view)
gtk_tree_path_free (spath);
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
LEAVE("journal format");
return (FALSE);
@@ -1030,8 +1029,7 @@ gnc_tree_view_split_reg_set_format (GncTreeViewSplitReg *view)
gtk_tree_path_free (spath);
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
return (FALSE);
}
@@ -1084,8 +1082,7 @@ gnc_tree_view_split_reg_format_trans (GncTreeViewSplitReg *view, Transaction *tr
gtk_tree_path_free (spath);
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
return (FALSE);
}
@@ -3764,8 +3761,7 @@ gtv_sr_button_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
gnc_tree_view_split_reg_expand_trans (view, NULL);
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
}
return TRUE;
}
@@ -4189,8 +4185,7 @@ gtv_sr_motion_cb (GtkTreeSelection *sel, gpointer user_data)
}
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
LEAVE(" ");
}
@@ -5880,8 +5875,7 @@ gnc_tree_view_split_reg_cancel_edit (GncTreeViewSplitReg *view, gboolean reg_clo
view->priv->auto_complete = FALSE; // reset auto_complete has run flag
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
LEAVE(" ");
}
@@ -6006,8 +6000,7 @@ gnc_tree_view_split_reg_collapse_trans (GncTreeViewSplitReg *view, Transaction *
view->priv->expanded = FALSE;
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
LEAVE(" ");
}
@@ -6074,8 +6067,7 @@ gnc_tree_view_split_reg_expand_trans (GncTreeViewSplitReg *view, Transaction *tr
gtk_tree_path_free (spath);
/* This updates the plugin page gui */
if (view->moved_cb)
(view->moved_cb)(view, view->moved_cb_data);
gnc_tree_view_split_reg_call_uiupdate_cb(view);
LEAVE(" ");
}
@@ -6133,9 +6125,21 @@ gnc_tree_view_split_reg_get_parent (GncTreeViewSplitReg *view)
/* This sets up the page gui update from the tree view motion callback */
void
gnc_tree_view_split_reg_moved_cb (GncTreeViewSplitReg *view, GFunc cb, gpointer cb_data)
gnc_tree_view_split_reg_set_uiupdate_cb (GncTreeViewSplitReg *view, GFunc cb, gpointer cb_data)
{
view->moved_cb = cb;
view->moved_cb_data = cb_data;
view->uiupdate_cb = cb;
view->uiupdate_cb_data = cb_data;
}
/** Call the moved_cb callback that is used to update the page ui, if it is
set. If it is not set, this function does nothing.
\return FALSE so that this function can be used in g_idle_add() */
gboolean gnc_tree_view_split_reg_call_uiupdate_cb(GncTreeViewSplitReg *view)
{
g_assert(view);
if (view->uiupdate_cb)
(view->uiupdate_cb)(view, view->uiupdate_cb_data);
return FALSE;
}
src/gnome-utils/gnc-tree-view-split-reg.h
+5 -3
View File
@@ -53,8 +53,8 @@ typedef struct
int stamp;
GtkWidget *window; // Parent Window.
GFunc moved_cb; // Used for page gui update
gpointer moved_cb_data; // Used for page gui update
GFunc uiupdate_cb; // Used for page gui update
gpointer uiupdate_cb_data; // Used for page gui update
gchar *help_text; // This is the help text to be displayed.
gint sort_depth; // This is the row the sort direction is based on.
@@ -134,7 +134,9 @@ void gnc_tree_view_split_reg_set_current_path (GncTreeViewSplitReg *view, GtkTre
RowDepth gnc_tree_view_reg_get_selected_row_depth (GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_moved_cb (GncTreeViewSplitReg *view, GFunc cb, gpointer cb_data);
void gnc_tree_view_split_reg_set_uiupdate_cb (GncTreeViewSplitReg *view, GFunc cb, gpointer cb_data);
gboolean gnc_tree_view_split_reg_call_uiupdate_cb(GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_refresh_from_gconf (GncTreeViewSplitReg *view);
src/gnome/gnc-split-reg2.c
+1 -1
View File
@@ -1110,5 +1110,5 @@ gnc_split_reg2_get_read_only (GNCSplitReg2 *gsr)
void
gnc_split_reg2_set_moved_cb (GNCSplitReg2 *gsr, GFunc cb, gpointer cb_data ) //this works
{
gnc_tree_view_split_reg_moved_cb (gnc_ledger_display2_get_split_view_register (gsr->ledger), cb, cb_data);
gnc_tree_view_split_reg_set_uiupdate_cb (gnc_ledger_display2_get_split_view_register (gsr->ledger), cb, cb_data);
}