|
|
|
|
@ -45,21 +45,21 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
|
|
|
|
|
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
|
|
|
|
|
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
|
|
|
|
|
|
|
|
|
|
static void gnc_search_owner_class_init (GNCSearchOwnerClass *klass);
|
|
|
|
|
static void gnc_search_owner_init (GNCSearchOwner *gspaper);
|
|
|
|
|
static void gnc_search_owner_finalize (GObject *obj);
|
|
|
|
|
static void gnc_search_owner_class_init (GNCSearchOwnerClass *klass);
|
|
|
|
|
static void gnc_search_owner_init (GNCSearchOwner *gspaper);
|
|
|
|
|
static void gnc_search_owner_finalize (GObject *obj);
|
|
|
|
|
|
|
|
|
|
#define _PRIVATE(x) (((GNCSearchOwner *)(x))->priv)
|
|
|
|
|
typedef struct _GNCSearchOwnerPrivate GNCSearchOwnerPrivate;
|
|
|
|
|
|
|
|
|
|
typedef struct _GNCSearchOwnerPrivate
|
|
|
|
|
{
|
|
|
|
|
GncOwner owner;
|
|
|
|
|
GncOwner owner;
|
|
|
|
|
GtkWindow * parent;
|
|
|
|
|
GtkWidget * owner_box;
|
|
|
|
|
GtkWidget * owner_choice;
|
|
|
|
|
GtkWidget * owner_box;
|
|
|
|
|
GtkWidget * owner_choice;
|
|
|
|
|
} GNCSearchOwnerPrivate;
|
|
|
|
|
|
|
|
|
|
#define GNC_SEARCH_OWNER_GET_PRIVATE(o) \
|
|
|
|
|
#define _PRIVATE(o) \
|
|
|
|
|
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_OWNER, GNCSearchOwnerPrivate))
|
|
|
|
|
|
|
|
|
|
static GNCSearchCoreTypeClass *parent_class;
|
|
|
|
|
@ -83,13 +83,13 @@ gnc_search_owner_get_type (void)
|
|
|
|
|
GTypeInfo type_info =
|
|
|
|
|
{
|
|
|
|
|
sizeof(GNCSearchOwnerClass), /* class_size */
|
|
|
|
|
NULL, /* base_init */
|
|
|
|
|
NULL, /* base_finalize */
|
|
|
|
|
NULL, /* base_init */
|
|
|
|
|
NULL, /* base_finalize */
|
|
|
|
|
(GClassInitFunc)gnc_search_owner_class_init,
|
|
|
|
|
NULL, /* class_finalize */
|
|
|
|
|
NULL, /* class_data */
|
|
|
|
|
sizeof(GNCSearchOwner), /* */
|
|
|
|
|
0, /* n_preallocs */
|
|
|
|
|
NULL, /* class_finalize */
|
|
|
|
|
NULL, /* class_data */
|
|
|
|
|
sizeof(GNCSearchOwner), /* */
|
|
|
|
|
0, /* n_preallocs */
|
|
|
|
|
(GInstanceInitFunc)gnc_search_owner_init,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -159,7 +159,7 @@ gncs_validate (GNCSearchCoreType *fe)
|
|
|
|
|
g_return_val_if_fail (fi, FALSE);
|
|
|
|
|
g_return_val_if_fail (IS_GNCSEARCH_OWNER (fi), FALSE);
|
|
|
|
|
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fi);
|
|
|
|
|
priv = _PRIVATE(fi);
|
|
|
|
|
if (priv->owner.owner.undefined == NULL)
|
|
|
|
|
{
|
|
|
|
|
valid = FALSE;
|
|
|
|
|
@ -177,7 +177,7 @@ owner_changed_cb (GtkWidget *widget, gpointer data)
|
|
|
|
|
GNCSearchOwner *fe = data;
|
|
|
|
|
GNCSearchOwnerPrivate *priv;
|
|
|
|
|
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fe);
|
|
|
|
|
priv = _PRIVATE(fe);
|
|
|
|
|
gnc_owner_get_owner (priv->owner_choice, &(priv->owner));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
@ -188,7 +188,7 @@ set_owner_widget (GNCSearchOwner *fe)
|
|
|
|
|
GNCSearchOwnerPrivate *priv;
|
|
|
|
|
|
|
|
|
|
/* Remove the old choice widget */
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fe);
|
|
|
|
|
priv = _PRIVATE(fe);
|
|
|
|
|
if (priv->owner_choice)
|
|
|
|
|
gtk_container_remove (GTK_CONTAINER (priv->owner_box), priv->owner_choice);
|
|
|
|
|
|
|
|
|
|
@ -215,7 +215,7 @@ type_combo_changed (GtkWidget *widget, GNCSearchOwner *fe)
|
|
|
|
|
type = gnc_combo_box_search_get_active(GTK_COMBO_BOX(widget));
|
|
|
|
|
|
|
|
|
|
/* If the type changed or if we don't have a type create the owner_choice */
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fe);
|
|
|
|
|
priv = _PRIVATE(fe);
|
|
|
|
|
if (type != gncOwnerGetType (&(priv->owner)))
|
|
|
|
|
{
|
|
|
|
|
priv->owner.type = type;
|
|
|
|
|
@ -234,7 +234,7 @@ make_type_menu (GNCSearchCoreType *fe)
|
|
|
|
|
GtkComboBox *combo;
|
|
|
|
|
GncOwnerType type;
|
|
|
|
|
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fi);
|
|
|
|
|
priv = _PRIVATE(fi);
|
|
|
|
|
type = gncOwnerGetType (&(priv->owner));
|
|
|
|
|
|
|
|
|
|
combo = GTK_COMBO_BOX(gnc_combo_box_new_search());
|
|
|
|
|
@ -275,7 +275,7 @@ pass_parent (GNCSearchCoreType *fe, gpointer parent)
|
|
|
|
|
g_return_if_fail (fi);
|
|
|
|
|
g_return_if_fail (IS_GNCSEARCH_OWNER (fi));
|
|
|
|
|
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fi);
|
|
|
|
|
priv = _PRIVATE(fi);
|
|
|
|
|
priv->parent = GTK_WINDOW(parent);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -289,7 +289,7 @@ gncs_get_widget (GNCSearchCoreType *fe)
|
|
|
|
|
g_return_val_if_fail (fi, NULL);
|
|
|
|
|
g_return_val_if_fail (IS_GNCSEARCH_OWNER (fi), NULL);
|
|
|
|
|
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fi);
|
|
|
|
|
priv = _PRIVATE(fi);
|
|
|
|
|
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
|
|
|
|
|
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
|
|
|
|
|
|
|
|
|
|
@ -325,7 +325,7 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe)
|
|
|
|
|
g_return_val_if_fail (fi, NULL);
|
|
|
|
|
g_return_val_if_fail (IS_GNCSEARCH_OWNER (fi), NULL);
|
|
|
|
|
|
|
|
|
|
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fi);
|
|
|
|
|
priv = _PRIVATE(fi);
|
|
|
|
|
guid = gncOwnerGetGUID (&(priv->owner));
|
|
|
|
|
l = g_list_prepend (l, (gpointer)guid);
|
|
|
|
|
|
|
|
|
|
@ -342,8 +342,8 @@ static GNCSearchCoreType *gncs_clone(GNCSearchCoreType *fe)
|
|
|
|
|
|
|
|
|
|
se = gnc_search_owner_new ();
|
|
|
|
|
se->how = fse->how;
|
|
|
|
|
se_priv = GNC_SEARCH_OWNER_GET_PRIVATE(se);
|
|
|
|
|
fse_priv = GNC_SEARCH_OWNER_GET_PRIVATE(fse);
|
|
|
|
|
se_priv = _PRIVATE(se);
|
|
|
|
|
fse_priv = _PRIVATE(fse);
|
|
|
|
|
gncOwnerCopy (&(fse_priv->owner), &(se_priv->owner));
|
|
|
|
|
|
|
|
|
|
return (GNCSearchCoreType *)se;
|
|
|
|
|
|