diff options
| author | Alberto Mardegan <mardy@users.sourceforge.net> | 2008-08-27 13:41:25 +0000 |
|---|---|---|
| committer | Alberto Mardegan <mardy@users.sourceforge.net> | 2008-08-27 13:41:25 +0000 |
| commit | 8fbb5fbcd40284f9d88b5fd640a78439060fe601 (patch) | |
| tree | 6e539003e5d847f3805b942a902d3407b2030acb | |
| parent | e161f676cc942cc841acfb6828d5beb2fe37696b (diff) | |
Change the order in which objects are instantiated, so that
McdDispatcher is available when McdManagers need it.
git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@527 d91c8aed-3f2b-0410-a83d-924a1c20a0ba
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mcd-master.c | 6 |
4 files changed, 21 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2008-08-27 Alberto Mardegan <alberto.mardegan@nokia.com> + + * src/mcd-master.c: + Change the order in which objects are instantiated, so that + McdDispatcher is available when McdManagers need it. + === telepathy-mission-control 5.0.beta28 === 2008-08-26 Alberto Mardegan <alberto.mardegan@nokia.com> diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml index d816543f..9250993a 100644 --- a/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml +++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-master.sgml @@ -23,11 +23,21 @@ McdMaster </para> +<!-- ##### ARG McdMaster:account-manager ##### --> +<para> + +</para> + <!-- ##### ARG McdMaster:dbus-connection ##### --> <para> </para> +<!-- ##### ARG McdMaster:dbus-daemon ##### --> +<para> + +</para> + <!-- ##### ARG McdMaster:default-presence ##### --> <para> diff --git a/src/Makefile.am b/src/Makefile.am index eb9a442b..19dc5fb6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,7 +98,7 @@ libmissioncontrol_server_la_LIBADD = \ libmissioncontrol_server_la_LDFLAGS = \ -export-symbols-regex '^((mc_)|(mcd_)|(mission_control_))' \ - -version-info "6":"0":"0" + -version-info "7":"0":"1" # the redundant quoting here is to prevent the libtool command line from # looking like an error message in an oddly named file diff --git a/src/mcd-master.c b/src/mcd-master.c index 2b601f74..25840ac4 100644 --- a/src/mcd-master.c +++ b/src/mcd-master.c @@ -622,13 +622,15 @@ mcd_master_constructor (GType type, guint n_params, if (!priv->account_manager) priv->account_manager = mcd_account_manager_new (priv->dbus_daemon); + + priv->dispatcher = mcd_dispatcher_new (priv->dbus_daemon, master); + g_assert (MCD_IS_DISPATCHER (priv->dispatcher)); + _mcd_account_manager_setup (priv->account_manager); install_dbus_filter (priv); priv->presence_frame = mcd_presence_frame_new (); - priv->dispatcher = mcd_dispatcher_new (priv->dbus_daemon, master); - g_assert (MCD_IS_DISPATCHER (priv->dispatcher)); /* propagate the signals to dispatcher and presence_frame, too */ priv->proxy = mcd_proxy_new (MCD_MISSION (master)); mcd_operation_take_mission (MCD_OPERATION (priv->proxy), |