r23060 - gnucash/trunk/src - Register2: Minor code cleanup: Rename moved_cb to uiupdate_cb. Refactor common sanity check into extra function.
Christian Stimming
cstim at code.gnucash.org
Thu Jun 20 16:44:45 EDT 2013
Author: cstim
Date: 2013-06-20 16:44:43 -0400 (Thu, 20 Jun 2013)
New Revision: 23060
Trac: http://svn.gnucash.org/trac/changeset/23060
Modified:
gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.h
gnucash/trunk/src/gnome/gnc-split-reg2.c
Log:
Register2: Minor code cleanup: Rename moved_cb to uiupdate_cb. Refactor common sanity check into extra function.
Modified: gnucash/trunk/src/gnome/gnc-split-reg2.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg2.c 2013-06-19 15:48:13 UTC (rev 23059)
+++ gnucash/trunk/src/gnome/gnc-split-reg2.c 2013-06-20 20:44:43 UTC (rev 23060)
@@ -1110,5 +1110,5 @@
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);
}
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c 2013-06-19 15:48:13 UTC (rev 23059)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c 2013-06-20 20:44:43 UTC (rev 23060)
@@ -981,8 +981,7 @@
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 @@
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 @@
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 @@
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 @@
}
/* 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 @@
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 @@
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 @@
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 @@
/* 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;
+}
+
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.h 2013-06-19 15:48:13 UTC (rev 23059)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.h 2013-06-20 20:44:43 UTC (rev 23060)
@@ -53,8 +53,8 @@
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,8 +134,10 @@
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);
GtkWidget * gnc_tree_view_split_reg_get_parent (GncTreeViewSplitReg *view);
More information about the gnucash-changes
mailing list