diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2011-02-09 08:35:03 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2011-02-09 08:35:03 +0000 |
| commit | 73ffa39f6fa7406c1d225deee2b6876079cf708a (patch) | |
| tree | 6ebb74316b9700db7924cf2fa5c5f646925fd09d /src | |
| parent | 4509656fd05de1590d5dd0d1e6429957861d00e0 (diff) | |
make trg_client property for trg-torrents-props so it's available in constructor
Diffstat (limited to 'src')
| -rw-r--r-- | src/trg-peers-model.c | 2 | ||||
| -rw-r--r-- | src/trg-torrent-props-dialog.c | 33 |
2 files changed, 23 insertions, 12 deletions
diff --git a/src/trg-peers-model.c b/src/trg-peers-model.c index d2e0191..574a9d1 100644 --- a/src/trg-peers-model.c +++ b/src/trg-peers-model.c @@ -41,9 +41,9 @@ G_DEFINE_TYPE(TrgPeersModel, trg_peers_model, GTK_TYPE_LIST_STORE) #define TRG_PEERS_MODEL_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_PEERS_MODEL, TrgPeersModelPrivate)) +#ifdef HAVE_GEOIP typedef struct _TrgPeersModelPrivate TrgPeersModelPrivate; -#ifdef HAVE_GEOIP struct _TrgPeersModelPrivate { GeoIP *geoip; }; diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c index d45fe66..353212c 100644 --- a/src/trg-torrent-props-dialog.c +++ b/src/trg-torrent-props-dialog.c @@ -39,7 +39,8 @@ G_DEFINE_TYPE(TrgTorrentPropsDialog, trg_torrent_props_dialog, enum { PROP_0, PROP_TREEVIEW, - PROP_PARENT_WINDOW + PROP_PARENT_WINDOW, + PROP_CLIENT }; #define TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(o) \ @@ -76,6 +77,9 @@ trg_torrent_props_dialog_set_property(GObject * object, case PROP_TREEVIEW: priv->tv = g_value_get_object(value); break; + case PROP_CLIENT: + priv->client = g_value_get_pointer(value); + break; } } @@ -95,6 +99,9 @@ trg_torrent_props_dialog_get_property(GObject * object, case PROP_PARENT_WINDOW: g_value_set_object(value, priv->parent); break; + case PROP_CLIENT: + g_value_set_pointer(value, priv->client); + break; } } @@ -348,6 +355,17 @@ trg_torrent_props_dialog_class_init(TrgTorrentPropsDialogClass * klass) G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); + + g_object_class_install_property(object_class, + PROP_CLIENT, + g_param_spec_pointer + ("trg-client", "TClient", + "Client", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); } static void @@ -361,15 +379,8 @@ TrgTorrentPropsDialog *trg_torrent_props_dialog_new(GtkWindow * window, treeview, trg_client * client) { - GObject *obj; - TrgTorrentPropsDialogPrivate *priv; - - obj = g_object_new(TRG_TYPE_TORRENT_PROPS_DIALOG, + return g_object_new(TRG_TYPE_TORRENT_PROPS_DIALOG, "parent-window", window, - "torrent-tree-view", treeview, NULL); - - priv = TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(obj); - priv->client = client; - - return TRG_TORRENT_PROPS_DIALOG(obj); + "torrent-tree-view", treeview, + "trg-client", client, NULL); } |