diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-27 16:26:46 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-27 16:26:46 +0100 |
| commit | d192b691e4464b29d970c40ba4f28117ccf6a094 (patch) | |
| tree | 7a4698a89127d428024054741a82b5c1b93a822d /lib | |
| parent | 8ee0526d6b07c329a016e8d0009db51e9839e9f4 (diff) | |
| parent | e742f63e9c56cc2c913fa8cfda7a9d583a2c2aa2 (diff) | |
| download | abrt-d192b691e4464b29d970c40ba4f28117ccf6a094.tar.gz abrt-d192b691e4464b29d970c40ba4f28117ccf6a094.tar.xz abrt-d192b691e4464b29d970c40ba4f28117ccf6a094.zip | |
Merge branch 'master' into rhel6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Utils/abrt_dbus.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/Utils/abrt_dbus.cpp b/lib/Utils/abrt_dbus.cpp index ad23d56c..8423e66c 100644 --- a/lib/Utils/abrt_dbus.cpp +++ b/lib/Utils/abrt_dbus.cpp @@ -148,7 +148,7 @@ static gboolean handle_dbus_fd(GIOChannel *gio, GIOCondition condition, gpointer while (dbus_connection_dispatch(g_dbus_conn) == DBUS_DISPATCH_DATA_REMAINS) VERB3 log("%s: more data to process, looping", __func__); - return TRUE; /* "glib, do not remove this even source!" */ + return TRUE; /* "glib, do not remove this event source!" */ } struct watch_app_info_t @@ -170,10 +170,8 @@ static void toggled_watch(DBusWatch *watch, void* data) app_info->watch_enabled = true; int dbus_flags = dbus_watch_get_flags(watch); int glib_flags = 0; - if (dbus_flags & DBUS_WATCH_READABLE) - glib_flags |= G_IO_IN; - if (dbus_flags & DBUS_WATCH_WRITABLE) - glib_flags |= G_IO_OUT; + if (dbus_flags & DBUS_WATCH_READABLE) glib_flags |= G_IO_IN; + if (dbus_flags & DBUS_WATCH_WRITABLE) glib_flags |= G_IO_OUT; VERB3 log(" adding watch to glib main loop. dbus_flags:%x glib_flags:%x", dbus_flags, glib_flags); app_info->event_source_id = g_io_add_watch(app_info->channel, GIOCondition(glib_flags), handle_dbus_fd, watch); } |