3.0 specific patch: change dbus_g to g_dbus