[Gnucash-changes] r13375 - gnucash/trunk - Minor code cleanup and
consolidations.
David Hampton
hampton at cvs.gnucash.org
Thu Feb 23 23:50:04 EST 2006
Author: hampton
Date: 2006-02-23 23:50:03 -0500 (Thu, 23 Feb 2006)
New Revision: 13375
Trac: http://svn.gnucash.org/trac/changeset/13375
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/gnome-utils/dialog-commodity.c
gnucash/trunk/src/gnome-utils/gnc-main-window.c
gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c
gnucash/trunk/src/gnome-utils/gnc-plugin-page.c
gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
gnucash/trunk/src/gnome-utils/gnc-recurrence.c
gnucash/trunk/src/gnome/gnc-plugin-page-register.c
gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
Log:
Minor code cleanup and consolidations.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/ChangeLog 2006-02-24 04:50:03 UTC (rev 13375)
@@ -1,3 +1,14 @@
+2006-02-23 David Hampton <hampton at employees.org>
+
+ * src/report/report-gnome/gnc-plugin-page-report.c:
+ * src/gnome-utils/gnc-recurrence.c:
+ * src/gnome-utils/gnc-plugin-file-history.c:
+ * src/gnome-utils/gnc-main-window.c:
+ * src/gnome-utils/gnc-plugin-page.[ch]:
+ * src/gnome-utils/dialog-commodity.c:
+ * src/gnome/gnc-plugin-page-register.c: Minor code cleanup and
+ consolidations.
+
2006-02-23 Joshua Sled <jsled at asynchronous.org>
* gentoo/gnucash-1.9.x.ebuild: Add ebuild for gnucash 1.9/2.0 series.
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-02-24 04:50:03 UTC (rev 13375)
@@ -588,16 +588,13 @@
static void
gnc_plugin_page_register_update_split_button (SplitRegister *reg, GncPluginPageRegister *page)
{
- GtkActionGroup *action_group;
GtkAction *action;
gboolean expanded;
expanded = gnc_split_register_current_trans_expanded(reg);
+ action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE(page),
+ "SplitTransactionAction");
- action_group = gnc_plugin_page_get_action_group(GNC_PLUGIN_PAGE(page));
- action = gtk_action_group_get_action (action_group,
- "SplitTransactionAction");
-
g_signal_handlers_block_by_func
(action, gnc_plugin_page_register_cmd_expand_transaction, page);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), expanded);
@@ -608,12 +605,10 @@
static void
gnc_plugin_page_register_update_toolbar (SplitRegister *reg, GncPluginPageRegister *page)
{
- GtkActionGroup *action_group;
GtkAction *action;
- action_group = gnc_plugin_page_get_action_group (GNC_PLUGIN_PAGE (page));
- action = gtk_action_group_get_action (action_group,
- "SplitTransactionAction");
+ action = gnc_plugin_page_get_action (GNC_PLUGIN_PAGE(page),
+ "SplitTransactionAction");
/* set sensitivity of split button */
gtk_action_set_sensitive (action, reg->style == REG_STYLE_LEDGER);
@@ -890,7 +885,6 @@
const gchar *group_name)
{
GncPluginPageRegisterPrivate *priv;
- GtkActionGroup *action_group;
GtkAction *action;
GError *error = NULL;
gchar *style_name;
@@ -899,7 +893,6 @@
ENTER(" ");
priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE(page);
- action_group = gnc_plugin_page_get_action_group(page);
/* Convert the style name to an index */
style_name = g_key_file_get_string(key_file, group_name,
@@ -915,9 +908,7 @@
/* Update the style menu action for this page */
if (i <= REG_STYLE_JOURNAL) {
DEBUG("Setting style: %d", i);
- action_group =
- gnc_plugin_page_get_action_group(page);
- action = gtk_action_group_get_action(action_group, radio_entries_2[i].name);
+ action = gnc_plugin_page_get_action(page, radio_entries_2[i].name);
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
}
@@ -925,8 +916,7 @@
use_double_line =
g_key_file_get_boolean(key_file, group_name, KEY_DOUBLE_LINE, &error);
DEBUG("Setting double_line_mode: %d", use_double_line);
- action = gtk_action_group_get_action(action_group,
- "ViewStyleDoubleLineAction");
+ action = gnc_plugin_page_get_action(page, "ViewStyleDoubleLineAction");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), use_double_line);
LEAVE(" ");
Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.c 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.c 2006-02-24 04:50:03 UTC (rev 13375)
@@ -532,7 +532,7 @@
if ((offset < cw->comm_section_top) || (offset >= cw->comm_section_bottom))
return;
- g_object_set(widget, "sensitive", !cw->is_currency, NULL);
+ gtk_widget_set_sensitive(widget, !cw->is_currency);
}
static void
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2006-02-24 04:50:03 UTC (rev 13375)
@@ -2501,7 +2501,7 @@
action = gtk_action_group_get_action(priv->action_group,
"ExtensionsAction");
- g_object_set(G_OBJECT(action), "visible", FALSE, (char *)NULL);
+ gtk_action_set_visible(action, FALSE);
}
/* GncPluginManager stuff */
Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-file-history.c 2006-02-24 04:50:03 UTC (rev 13375)
@@ -34,6 +34,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
+#include "gtk-compat.h"
#include <string.h>
#include "gnc-file.h"
@@ -316,7 +317,7 @@
g_free(old_filename);
g_object_set_data(G_OBJECT(action), FILENAME_STRING, g_strdup(filename));
} else {
- g_object_set(G_OBJECT(action), "visible", FALSE, NULL);
+ gtk_action_set_visible(action, FALSE);
}
g_free(action_name);
LEAVE("");
Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-page.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-page.c 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-page.c 2006-02-24 04:50:03 UTC (rev 13375)
@@ -300,6 +300,21 @@
}
+GtkAction *
+gnc_plugin_page_get_action (GncPluginPage *page, const gchar *name)
+{
+ GncPluginPagePrivate *priv;
+
+ g_return_val_if_fail(GNC_IS_PLUGIN_PAGE(page), NULL);
+ g_return_val_if_fail(name != NULL, NULL);
+
+ priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page);
+ if (!priv->action_group)
+ return NULL;
+ return gtk_action_group_get_action (priv->action_group, name);
+}
+
+
/* Retrieve the textual name of a plugin. */
const gchar *
gnc_plugin_page_get_plugin_name (GncPluginPage *plugin_page)
Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-page.h 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-page.h 2006-02-24 04:50:03 UTC (rev 13375)
@@ -451,6 +451,15 @@
GtkActionGroup * gnc_plugin_page_create_action_group (GncPluginPage *page,
const gchar *group_name);
+/** Retrieve a GtkAction object associated with this page.
+ *
+ * @param page The page whose menu/toolbar action group should be
+ * retrieved.
+ *
+ * @param name The name of the GtkAction to find.
+ *
+ * @return A pointer to the retuested GtkAction object or NULL. */
+GtkAction *gnc_plugin_page_get_action (GncPluginPage *page, const gchar *name);
/* Signals */
void gnc_plugin_page_inserted (GncPluginPage *plugin_page);
Modified: gnucash/trunk/src/gnome-utils/gnc-recurrence.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-recurrence.c 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/gnome-utils/gnc-recurrence.c 2006-02-24 04:50:03 UTC (rev 13375)
@@ -393,8 +393,7 @@
G_CALLBACK(grc_changed), grc );
grc->num_rec++;
- g_object_set(G_OBJECT(grc->buttRemove), "sensitive",
- (grc->num_rec > 1), NULL);
+ gtk_widget_set_sensitive(GTK_WIDGET(grc->buttRemove), (grc->num_rec > 1));
g_signal_emit_by_name(G_OBJECT(grc), "changed", NULL);
@@ -412,8 +411,7 @@
g_signal_emit_by_name(G_OBJECT(grc), "changed", NULL);
- g_object_set(G_OBJECT(grc->buttRemove), "sensitive",
- (grc->num_rec > 1), NULL);
+ gtk_widget_set_sensitive(GTK_WIDGET(grc->buttRemove), (grc->num_rec > 1));
}
Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2006-02-24 02:57:09 UTC (rev 13374)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2006-02-24 04:50:03 UTC (rev 13375)
@@ -41,6 +41,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include "gtk-compat.h"
#ifndef HAVE_GLIB26
#include "gkeyfile.h"
#endif
@@ -992,29 +993,21 @@
static void
gnc_plugin_page_report_set_fwd_button(GncPluginPageReport *report, int enabled)
{
- GtkActionGroup *action_group;
- GValue value = { 0 };
GtkAction *act;
- action_group = gnc_plugin_page_get_action_group(GNC_PLUGIN_PAGE(report));
- act = gtk_action_group_get_action( action_group, "ReportForwAction" );
- g_value_init (&value, G_TYPE_BOOLEAN);
- g_value_set_boolean (&value, enabled);
- g_object_set_property( G_OBJECT(act), "sensitive", &value );
+ act = gnc_plugin_page_get_action(GNC_PLUGIN_PAGE(report),
+ "ReportForwAction" );
+ gtk_action_set_sensitive(act, enabled);
}
static void
gnc_plugin_page_report_set_back_button(GncPluginPageReport *report, int enabled)
{
- GtkActionGroup *action_group;
- GValue value = { 0 };
GtkAction *act;
- action_group = gnc_plugin_page_get_action_group(GNC_PLUGIN_PAGE(report));
- act = gtk_action_group_get_action( action_group, "ReportBackAction" );
- g_value_init (&value, G_TYPE_BOOLEAN);
- g_value_set_boolean (&value, enabled);
- g_object_set_property( G_OBJECT(act), "sensitive", &value );
+ act = gnc_plugin_page_get_action(GNC_PLUGIN_PAGE(report),
+ "ReportBackAction" );
+ gtk_action_set_sensitive(act, enabled);
}
// ------------------------------------------------------------
More information about the gnucash-changes
mailing list