summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2012-04-16 10:19:57 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2012-04-16 10:19:57 +0900
commit75df361698c7be58e33993784f2d6b9b0957fd44 (patch)
tree243c5f3be2a7019efbe6199aa646fdca7d8320a8
parent6c5e5d09cb13989e21c7d533e9c0332feb3f0208 (diff)
downloadibus-75df361698c7be58e33993784f2d6b9b0957fd44.tar.gz
Fix the order of arguments in NameOwnerChanged
BUG=RH#799571 TEST=Linux desktop Review URL: https://codereview.appspot.com/6022044
-rw-r--r--ui/gtk3/application.vala8
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
index d49deb4d..b54821ca 100644
--- a/ui/gtk3/application.vala
+++ b/ui/gtk3/application.vala
@@ -92,7 +92,10 @@ class Application {
Variant parameters) {
debug("signal_name = %s", signal_name);
m_panel = new Panel(m_bus);
- m_panel.set_config(m_config);
+
+ if (m_config != null) {
+ m_panel.set_config(m_config);
+ }
}
private void bus_name_lost_cb(DBusConnection connection,
@@ -113,7 +116,8 @@ class Application {
Variant parameters) {
debug("signal_name = %s", signal_name);
string name, new_owner, old_owner;
- parameters.get("(sss)", out name, out new_owner, out old_owner);
+ parameters.get("(sss)", out name, out old_owner, out new_owner);
+
if (new_owner == "") {
m_config = null;
} else {